Author: qboosh Date: Sat Dec 30 18:25:38 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 5.6
---- Files affected:
SOURCES:
ncurses-gnome-terminal.patch (1.2 -> 1.3) , ncurses-linking.patch (1.5 ->
1.6) , ncurses-meta.patch (1.1 -> 1.2) , ncurses-screen_hpa_fix.patch (1.4 ->
1.5) , ncurses-xterm-home-end.patch (1.3 -> 1.4) , ncurses-xterm_hpa_fix.patch
(1.1 -> 1.2) , ncurses-xterm-kbs.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/ncurses-gnome-terminal.patch
diff -u SOURCES/ncurses-gnome-terminal.patch:1.2
SOURCES/ncurses-gnome-terminal.patch:1.3
--- SOURCES/ncurses-gnome-terminal.patch:1.2 Mon Mar 29 23:08:14 2004
+++ SOURCES/ncurses-gnome-terminal.patch Sat Dec 30 19:25:33 2006
@@ -1,12 +1,12 @@
---- ncurses-5.3/misc/terminfo.src~ Mon Mar 3 03:23:15 2003
-+++ ncurses-5.3/misc/terminfo.src Mon Mar 3 03:24:52 2003
-@@ -3044,7 +3044,8 @@
+--- ncurses-5.6/misc/terminfo.src.orig 2006-12-30 17:02:42.371293084 +0100
++++ ncurses-5.6/misc/terminfo.src 2006-12-30 17:04:19.372820886 +0100
+@@ -3404,7 +3404,8 @@
# it hangs in tack after running function-keys test.
- gnome-rh72|GNOME Terminal,
- bce,
-- civis=\E[?25l, cnorm=\E[?25h, kdch1=\E[3~, kf1=\EOP,
-+ civis=\E[?25l, cnorm=\E[?25h, kbs=\177, kdch1=\E[3~, kf1=\EOP,
-+ khome=\E[1~, kend=\E[4~,
- 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%;,
- smam=\E[?7h, tbc@, use=xterm-color,
+ 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,
+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\016%e\017%;,
+ sgr0=\E[0m\017, smam=\E[?7h, tbc@, use=xterm-color,
================================================================
Index: SOURCES/ncurses-linking.patch
diff -u SOURCES/ncurses-linking.patch:1.5 SOURCES/ncurses-linking.patch:1.6
--- SOURCES/ncurses-linking.patch:1.5 Sat Aug 5 18:52:26 2006
+++ SOURCES/ncurses-linking.patch Sat Dec 30 19:25:33 2006
@@ -1,18 +1,14 @@
-diff -Nur ncurses-5.5.orig/mk-1st.awk ncurses-5.5.linking/mk-1st.awk
---- ncurses-5.5.orig/mk-1st.awk 2005-06-18 21:15:57.000000000 +0200
-+++ ncurses-5.5.linking/mk-1st.awk 2006-08-05 18:50:18.000000000 +0200
-@@ -210,9 +210,9 @@
- print "[EMAIL PROTECTED] -f $@";
- }
- if ( subset == "termlib" || subset ==
"termlib+ext_tinfo" ) {
-- printf "\t$(MK_SHARED_LIB) $(%s_OBJS)
$(TINFO_LIST) $(LDFLAGS)\n", OBJS
-+ printf "\t$(MK_SHARED_LIB) $(LDFLAGS)
$(%s_OBJS) $(TINFO_LIST)\n", OBJS
- } else {
-- printf "\t$(MK_SHARED_LIB) $(%s_OBJS)
$(SHLIB_LIST) $(LDFLAGS)\n", OBJS
-+ printf "\t$(MK_SHARED_LIB) $(LDFLAGS)
$(%s_OBJS) $(SHLIB_LIST)\n", OBJS
- }
- sharedlinks("../lib")
-
+--- ncurses-5.6/mk-1st.awk.orig 2006-12-30 17:40:34.164755215 +0100
++++ ncurses-5.6/mk-1st.awk 2006-12-30 17:42:11.054276635 +0100
+@@ -83,7 +83,7 @@
+ }
+ }
+ function make_shlib(objs, shlib_list) {
+- printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(%s) $(LDFLAGS)\n",
objs, shlib_list
++ printf "\t$(MK_SHARED_LIB) $(LDFLAGS) $(%s_OBJS) $(%s)\n",
objs, shlib_list
+ }
+ function sharedlinks(directory) {
+ if ( ShlibVer != "auto" && ShlibVer != "cygdll" ) {
diff -Nur ncurses-5.5.orig/progs/Makefile.in
ncurses-5.5.linking/progs/Makefile.in
--- ncurses-5.5.orig/progs/Makefile.in 2006-08-05 18:50:12.000000000 +0200
+++ ncurses-5.5.linking/progs/Makefile.in 2006-08-05 18:50:21.000000000
+0200
================================================================
Index: SOURCES/ncurses-meta.patch
diff -u SOURCES/ncurses-meta.patch:1.1 SOURCES/ncurses-meta.patch:1.2
--- SOURCES/ncurses-meta.patch:1.1 Wed Dec 26 11:21:18 2001
+++ SOURCES/ncurses-meta.patch Sat Dec 30 19:25:33 2006
@@ -1,47 +1,29 @@
---- ncurses-5.2/misc/terminfo.src~ Wed Dec 26 11:13:07 2001
-+++ ncurses-5.2/misc/terminfo.src Wed Dec 26 11:17:24 2001
-@@ -2441,7 +2441,7 @@
+--- ncurses-5.6/misc/terminfo.src.orig 2006-12-30 16:57:06.000124384 +0100
++++ ncurses-5.6/misc/terminfo.src 2006-12-30 16:59:12.647341598 +0100
+@@ -2741,7 +2741,7 @@
# "resize -s"), though it does not pass SIGWINCH to the application if the
# user resizes the window with the mouse.
- teraterm|Tera Term Pro,
-- km, xon@,
-+ xon@,
- ncv#43, vt@,
-
acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
- blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J,
-@@ -2533,7 +2533,7 @@
+ teraterm|Tera Term Pro,
+- km, xon@,
++ xon@,
+ ncv#43, vt@,
+
acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
+ blink=\E[5m, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[J,
+@@ -2893,7 +2893,7 @@
# (khome/kend do not actually work in X11R5 or X11R6, but many people use this
# for compatibility with other emulators).
- xterm-r6|xterm-old|xterm X11R6 version,
-- OTbs, am, km, mir, msgr, xenl,
-+ OTbs, am, mir, msgr, xenl,
- cols#80, it#8, lines#24,
- acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
- bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=^M,
-@@ -2938,7 +2938,7 @@
- # Since rxvt is not really compatible with xterm, it should be configured as
- # "rxvt" (monochrome) and "rxvt-color".
- rxvt-basic|rxvt terminal base (X Window System),
-- OTbs, am, bce, eo, km, mir, msgr, xenl, xon,
-+ OTbs, am, bce, eo, mir, msgr, xenl, xon,
- cols#80, it#8, lines#24,
- acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
- bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
-@@ -2977,7 +2977,7 @@
- # removed kf0 which conflicts with kf10 -TD
- # remove cvvis which conflicts with cnorm -TD
- Eterm|Eterm-color|Eterm with xterm-style color support (X Window System),
-- am, bce, bw, eo, km, mc5i, mir, msgr, xenl, xon,
-+ am, bce, bw, eo, mc5i, mir, msgr, xenl, xon,
- btns#5, cols#80, it#8, lines#24, lm#0, ncv@,
- acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
- bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
-@@ -3217,7 +3217,7 @@
+ xterm-r6|xterm-old|xterm X11R6 version,
+- OTbs, am, km, mir, msgr, xenl,
++ OTbs, am, mir, msgr, xenl,
+ cols#80, it#8, lines#24,
+ acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=^M,
+@@ -4138,7 +4138,7 @@
#
# tested with screen 3.09.08
- screen|VT 100/ANSI X3.64 virtual terminal,
-- OTbs, OTpt, am, km, mir, msgr, xenl, G0,
-+ OTbs, OTpt, am, mir, msgr, xenl, G0,
- colors#8, cols#80, it#8, lines#24, pairs#64,
-
acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
- bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+ screen|VT 100/ANSI X3.64 virtual terminal,
+- OTbs, OTpt, am, km, mir, msgr, xenl, G0,
++ OTbs, OTpt, am, mir, msgr, xenl, G0,
+ colors#8, cols#80, it#8, lines#24, pairs#64,
+ acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
================================================================
Index: SOURCES/ncurses-screen_hpa_fix.patch
diff -u SOURCES/ncurses-screen_hpa_fix.patch:1.4
SOURCES/ncurses-screen_hpa_fix.patch:1.5
--- SOURCES/ncurses-screen_hpa_fix.patch:1.4 Fri Jun 18 15:05:28 2004
+++ SOURCES/ncurses-screen_hpa_fix.patch Sat Dec 30 19:25:33 2006
@@ -1,11 +1,11 @@
---- ncurses-5.4/misc/terminfo.src.orig Fri Jun 18 14:46:01 2004
-+++ ncurses-5.4/misc/terminfo.src Fri Jun 18 14:47:06 2004
-@@ -3663,7 +3663,7 @@
-
sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
- sgr0=\E[m, smacs=^N, smcup=\E[?1049h, smir=\E[4h,
- smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g, E0=\E(B,
-- S0=\E(%p1%c, use=ecma+color,
+--- ncurses-5.6/misc/terminfo.src.orig 2006-10-07 19:52:03.000000000 +0200
++++ ncurses-5.6/misc/terminfo.src 2006-12-30 16:47:00.309608049 +0100
+@@ -4161,7 +4161,7 @@
+
sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
+ sgr0=\E[m\017, smacs=^N, smcup=\E[?1049h, smir=\E[4h,
+ smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g, E0=\E(B,
+- S0=\E(%p1%c, use=ecma+color,
+ S0=\E(%p1%c, use=ecma+color, hpa=\E[%i%p1%dG,
# 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,
+ screen-bce|VT 100/ANSI X3.64 virtual terminal with bce,
================================================================
Index: SOURCES/ncurses-xterm-home-end.patch
diff -u SOURCES/ncurses-xterm-home-end.patch:1.3
SOURCES/ncurses-xterm-home-end.patch:1.4
--- SOURCES/ncurses-xterm-home-end.patch:1.3 Tue Mar 30 17:16:38 2004
+++ SOURCES/ncurses-xterm-home-end.patch Sat Dec 30 19:25:33 2006
@@ -1,13 +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
-@@ -2755,8 +2755,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,
- rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>, sc=\E7,
+--- 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,
+ rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8, sc=\E7,
================================================================
Index: SOURCES/ncurses-xterm_hpa_fix.patch
diff -u SOURCES/ncurses-xterm_hpa_fix.patch:1.1
SOURCES/ncurses-xterm_hpa_fix.patch:1.2
--- SOURCES/ncurses-xterm_hpa_fix.patch:1.1 Fri Sep 21 08:14:56 2001
+++ SOURCES/ncurses-xterm_hpa_fix.patch Sat Dec 30 19:25:33 2006
@@ -1,11 +1,11 @@
---- ncurses-5.2/misc/terminfo.src~ Fri Sep 21 08:02:24 2001
-+++ ncurses-5.2/misc/terminfo.src Fri Sep 21 08:12:30 2001
-@@ -2542,7 +2542,7 @@
- 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, enacs=\E)0, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL,
-- il1=\E[L, ind=^J,
-+ il1=\E[L, ind=^J, hpa=\E[%i%p1%dG,
- is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^H,
- kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
- kdch1=\E[3~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
+--- ncurses-5.6/misc/terminfo.src.orig 2006-12-30 16:47:29.671281275 +0100
++++ ncurses-5.6/misc/terminfo.src 2006-12-30 16:56:15.349237954 +0100
+@@ -2902,7 +2902,7 @@
+ 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, enacs=\E)0, home=\E[H, ht=^I, hts=\EH, il=\E[%p1%dL,
+- il1=\E[L, ind=^J,
++ il1=\E[L, ind=^J, hpa=\E[%i%p1%dG,
+ is2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8, kbs=^H,
+ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ kdch1=\E[3~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
================================================================
Index: SOURCES/ncurses-xterm-kbs.patch
diff -u SOURCES/ncurses-xterm-kbs.patch:1.2 SOURCES/ncurses-xterm-kbs.patch:1.3
--- SOURCES/ncurses-xterm-kbs.patch:1.2 Fri Dec 23 00:40:16 2005
+++ SOURCES/ncurses-xterm-kbs.patch Sat Dec 30 19:25:33 2006
@@ -1,11 +1,11 @@
---- ncurses-5.4/misc/terminfo.src.xterm-kbs 2005-04-17 09:17:09.416779464
+0200
-+++ ncurses-5.4/misc/terminfo.src 2005-04-17 09:18:59.974972064 +0200
-@@ -2982,7 +2982,7 @@
- kRIT=\E[1;2C, kb2=\EOE, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
- kcuf1=\EOC, kcuu1=\EOA, kend=\EOF, kent=\EOM, khome=\EOH,
- kich1=\E[2~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~,
-- kpp=\E[5~, kri=\E[1;2A, rin=\E[%p1%dT, use=xterm+pcfkeys,
-+ kpp=\E[5~, kbs=\177, kri=\E[1;2A, rin=\E[%p1%dT, use=xterm+pcfkeys,
- use=xterm-basic,
+--- ncurses-5.6/misc/terminfo.src.orig 2006-12-30 17:12:31.136844922 +0100
++++ ncurses-5.6/misc/terminfo.src 2006-12-30 17:38:53.471017008 +0100
+@@ -3019,7 +3019,7 @@
+ kRIT=\E[1;2C, kb2=\EOE, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
+ kcuf1=\EOC, kcuu1=\EOA, kend=\EOF, kent=\EOM, khome=\EOH,
+ kich1=\E[2~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~,
+- kpp=\E[5~, kri=\E[1;2A, rin=\E[%p1%dT, use=xterm+pcfkeys,
++ kpp=\E[5~, kbs=\177, kri=\E[1;2A, rin=\E[%p1%dT, use=xterm+pcfkeys,
+ use=xterm-basic,
#
# This fragment describes as much of XFree86 xterm's "pc-style" function
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/ncurses-gnome-terminal.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/ncurses-linking.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SOURCES/ncurses-meta.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/ncurses-screen_hpa_fix.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SOURCES/ncurses-xterm-home-end.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/ncurses-xterm_hpa_fix.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/ncurses-xterm-kbs.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
