commit e7cbaa4d573fbd55ce2a8c6c9b4686aad9542c46 Author: Marcin Krol <h...@tld-linux.org> Date: Fri Jul 21 00:05:15 2023 +0200
- rediffed ncurses-fix-nonunicode-breakage.patch | 13 +++++++------ ncurses-meta.patch | 15 ++++++++------- ncurses-mouse_trafo-warning.patch | 11 ++++++----- 3 files changed, 21 insertions(+), 18 deletions(-) --- diff --git a/ncurses-fix-nonunicode-breakage.patch b/ncurses-fix-nonunicode-breakage.patch index 2a23fb4..0219e42 100644 --- a/ncurses-fix-nonunicode-breakage.patch +++ b/ncurses-fix-nonunicode-breakage.patch @@ -4,13 +4,14 @@ codes - it had a chance to work on non-unicode terminal only if G1 was mapped to CP437 map, which is not the default; the default for G1 is VT100 map, which works with VT100-specific acsc string - and that's what this patch changes. ---- ncurses-5.9/misc/terminfo.src.orig 2011-11-05 08:32:32.280686759 +0100 -+++ ncurses-5.9/misc/terminfo.src 2011-11-05 13:37:42.217966510 +0100 -@@ -945,6 +945,7 @@ - # Using SI/SO has the drawback that it confuses screen. SCS would work. - # However, SCS is buggy (see comment in Debian #515609) -TD +diff -urNp -x '*.orig' compat-ncurses5-5.9.20150117.org/misc/terminfo.src compat-ncurses5-5.9.20150117/misc/terminfo.src +--- compat-ncurses5-5.9.20150117.org/misc/terminfo.src 2023-07-21 00:00:49.116051986 +0200 ++++ compat-ncurses5-5.9.20150117/misc/terminfo.src 2023-07-21 00:00:50.115066314 +0200 +@@ -1633,6 +1633,7 @@ linux2.2|linux 2.2.x console, + # Further, this breaks longstanding workarounds for Linux console's line + # drawing (see Debian 665959) -TD linux2.6|linux 2.6.x console, + acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, rmacs=^O, - sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, + sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, use=linux2.2, diff --git a/ncurses-meta.patch b/ncurses-meta.patch index 9a735b7..5c3ac5e 100644 --- a/ncurses-meta.patch +++ b/ncurses-meta.patch @@ -1,6 +1,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 @@ +diff -urNp -x '*.orig' compat-ncurses5-5.9.20150117.org/misc/terminfo.src compat-ncurses5-5.9.20150117/misc/terminfo.src +--- compat-ncurses5-5.9.20150117.org/misc/terminfo.src 2023-07-20 23:59:03.823541888 +0200 ++++ compat-ncurses5-5.9.20150117/misc/terminfo.src 2023-07-20 23:59:04.799555886 +0200 +@@ -3607,7 +3607,7 @@ putty-sco|putty with SCO function keys, # "resize -s"), though it does not pass SIGWINCH to the application if the # user resizes the window with the mouse. teraterm2.3|Tera Term Pro, @@ -9,7 +10,7 @@ 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, -@@ -3240,7 +3240,7 @@ +@@ -3786,7 +3786,7 @@ xterm-r5|xterm R5 version, # (khome/kend do not actually work in X11R5 or X11R6, but many people use this # for compatibility with other emulators). xterm-r6|xterm X11R6 version, @@ -18,9 +19,9 @@ 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 +@@ -5891,7 +5891,7 @@ eterm-color|Emacs term.el terminal emula + # sgr are not impacted (because that usually resets all capabilities before + # setting any), but termcap applications do not use sgr -TD screen|VT 100/ANSI X3.64 virtual terminal, - OTbs, OTpt, am, km, mir, msgr, xenl, G0, + OTbs, OTpt, am, mir, msgr, xenl, G0, diff --git a/ncurses-mouse_trafo-warning.patch b/ncurses-mouse_trafo-warning.patch index 9201312..ae368cf 100644 --- a/ncurses-mouse_trafo-warning.patch +++ b/ncurses-mouse_trafo-warning.patch @@ -1,8 +1,9 @@ ---- 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); +diff -urNp -x '*.orig' compat-ncurses5-5.9.20150117.org/include/curses.tail compat-ncurses5-5.9.20150117/include/curses.tail +--- compat-ncurses5-5.9.20150117.org/include/curses.tail 2023-07-21 00:00:22.913676193 +0200 ++++ compat-ncurses5-5.9.20150117/include/curses.tail 2023-07-21 00:00:24.466698467 +0200 +@@ -111,8 +111,6 @@ extern NCURSES_EXPORT(mmask_t) NCURSES_S + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mouseinterval) (SCREEN*, int); + #endif -#define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen) - ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/compat-ncurses5.git/commitdiff/e7cbaa4d573fbd55ce2a8c6c9b4686aad9542c46 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit