- ncurses-screen.patch replaced by ncurses-meta.patch: more terminals

  use 8th bit for extended charset and not meta, i.e. screen, xterm,
  rxvt, Eterm, teraterm. Anything else?
  epic is an example of a program which misbehaves with wrong setting
  here (can't enter 8bit chars if configured to take this property from
  terminfo).
- Release 20.

Changed files:
    ncurses-meta.patch -> 1.1
    ncurses-screen.patch -> 1.2
    ncurses.spec -> 1.78

diff --git a/ncurses-meta.patch b/ncurses-meta.patch
new file mode 100644 (file)
index 0000000..0d6bd38
--- /dev/null
+++ b/ncurses-meta.patch
@@ -0,0 +1,47 @@
+--- 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 @@
+ # "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 @@
+ # (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 @@
+ #
+ # 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, 

diff --git a/ncurses-screen.patch b/ncurses-screen.patch
deleted file mode 100644 (file)
index 193a156..0000000
--- a/ncurses-screen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ncurses-5.2/misc/terminfo.src~     Wed Dec 26 01:07:46 2001
-+++ ncurses-5.2/misc/terminfo.src      Wed Dec 26 01:09:10 2001
-@@ -3217,7 +3217,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, 

diff --git a/ncurses.spec b/ncurses.spec
index 0334af25ccb4b3404fd7a863e45d637143bd5bfa..0b5d23e7ecf21bcb0904cc3baec42845892f73d7 100644 (file)
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -7,7 +7,7 @@ Summary(pt_BR): Biblioteca de controle de terminal curses
 Summary(tr):   Terminal kontrol kitaplýðý
 Name:          ncurses
 Version:       5.2
-Release:       19
+Release:       20
 License:       distributable
 Group:         Libraries
 Group(de):     Libraries
@@ -27,7 +27,7 @@ Patch3:               %{name}-screen_hpa_fix.patch
 Patch4:                %{name}-xterm-color.patch
 Patch5:                %{name}-xterm_hpa_fix.patch
 Patch6:                %{name}-rxvt.patch
-Patch7:                %{name}-screen.patch
+Patch7:                %{name}-meta.patch
 BuildRequires: sharutils
 BuildRequires: sed
 BuildRequires: libstdc++-devel
@@ -247,7 +247,7 @@ sh %{SOURCE2}
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
+#%patch7 -p1
 
 %build
 CFLAGS="%{rpmcflags} -DPURE_TERMINFO"