Temporarily revert contrib/ncurses local mods for upgrade
authorJohn Marino <draco@marino.st>
Fri, 11 Mar 2016 18:58:00 +0000 (19:58 +0100)
committerJohn Marino <draco@marino.st>
Fri, 11 Mar 2016 20:00:10 +0000 (21:00 +0100)
contrib/ncurses/misc/terminfo.src
contrib/ncurses/ncurses/base/MKlib_gen.sh
contrib/ncurses/ncurses/tinfo/comp_scan.c

index f2065db..04163e0 100644 (file)
@@ -3460,14 +3460,14 @@ xterm-basic|modern xterm terminal emulator - common,
        ind=^J, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^H,
        kmous=\E[M, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, meml=\El,
        memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
-       rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
+       rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l, rmir=\E[4l,
        rmkx=\E[?1l\E>, rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m,
        rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7,
        setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
        setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
        setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
        sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
-       sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h,
+       sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smcup=\E[?1049h,
        smir=\E[4h, smkx=\E[?1h\E=, smm=\E[?1034h, smso=\E[7m,
        smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt100+enq,
 
index b92f22b..66ae295 100755 (executable)
@@ -437,22 +437,11 @@ sed -n -f $ED1 \
        -e 's/gen_$//' \
        -e 's/  / /g' >>$TMP
 
-cat >$ED1 <<EOF
-s/  / /g
-s/^ //
-s/ $//
-s/P_NCURSES_BOOL/NCURSES_BOOL/g
-EOF
-
-# A patch discussed here:
-#      https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
-# introduces spurious #line markers.  Work around that by ignoring the system's
-# attempt to define "bool" and using our own symbol here.
-sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
-cat $ED2 >$TMP
-
 $preprocessor $TMP 2>/dev/null \
-| sed -f $ED1 \
+| sed \
+       -e 's/  / /g' \
+       -e 's/^ //' \
+       -e 's/_Bool/NCURSES_BOOL/g' \
 | $AWK -f $AW2 \
 | sed -f $ED3 \
 | sed \
index a8c5534..8725b2e 100644 (file)
@@ -525,10 +525,8 @@ _nc_get_token(bool silent)
                if (!silent) {
                    if (*after_list == '\0')
                        _nc_warning("empty longname field");
-#ifndef DRAGONFLY_NATIVE
                    else if (strchr(after_list, ' ') == 0)
                        _nc_warning("older tic versions may treat the description field as an alias");
-#endif
                }
            } else {
                after_list = tok_buf + strlen(tok_buf);