SHA256
1
0
forked from pool/ncurses
Dr. Werner Fink 2017-05-19 13:43:11 +00:00 committed by Git OBS Bridge
parent d3e11ed407
commit e8de37bc5f
5 changed files with 137 additions and 35 deletions

View File

@ -11,7 +11,7 @@
--- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2017-04-24 07:47:15.533617238 +0000
@@ -754,7 +754,7 @@ _nc_read_entry2(const char *const name,
@@ -752,7 +752,7 @@ _nc_read_entry2(const char *const name,
return code;
}

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ade8bed120df0e88cacfa6d9f19a2900473615191706ec2bc33536f6518d0a5
size 2187413
oid sha256:aa2ac44fe56d62142e554db5216e043bd9edc8ac8a31f21e4461ffd42b76a3b2
size 2558214

View File

@ -1,6 +1,6 @@
---
aclocal.m4 | 40 +++++++-----
configure | 41 +++++++------
aclocal.m4 | 40 ++++++------
configure | 41 +++++++-----
include/curses.h.in | 3
include/termcap.h.in | 2
include/tic.h | 4 -
@ -8,7 +8,7 @@
man/ncurses.3x | 4 +
misc/gen-pkgconfig.in | 7 +-
misc/ncurses-config.in | 2
misc/terminfo.src | 133 +++++++++++++++++++++++++++++++++----------
misc/terminfo.src | 140 ++++++++++++++++++++++++++++++++++---------
ncurses/Makefile.in | 2
ncurses/curses.priv.h | 2
ncurses/run_cmd.sh | 11 +++
@ -18,10 +18,10 @@
ncurses/tinfo/read_entry.c | 2
ncurses/tinfo/read_termcap.c | 21 ++++--
test/test.priv.h | 4 -
19 files changed, 240 insertions(+), 80 deletions(-)
19 files changed, 247 insertions(+), 80 deletions(-)
--- aclocal.m4
+++ aclocal.m4 2017-04-24 06:53:27.176085343 +0000
+++ aclocal.m4 2017-05-10 11:59:56.037033307 +0000
@@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out
@ -150,7 +150,7 @@
esac
done
--- configure
+++ configure 2017-04-24 06:53:27.184085187 +0000
+++ configure 2017-05-10 11:59:56.041033232 +0000
@@ -5925,7 +5925,7 @@ case $cf_cv_system_name in
fi
;;
@ -287,7 +287,7 @@
# the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME}
--- include/curses.h.in
+++ include/curses.h.in 2017-04-24 06:53:27.184085187 +0000
+++ include/curses.h.in 2017-05-10 11:59:56.041033232 +0000
@@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
typedef @cf_cv_typeof_mmask_t@ mmask_t;
#endif
@ -299,7 +299,7 @@
* We need FILE, etc. Include this before checking any feature symbols.
*/
--- include/termcap.h.in
+++ include/termcap.h.in 2017-04-24 06:53:27.184085187 +0000
+++ include/termcap.h.in 2017-05-10 11:59:56.041033232 +0000
@@ -46,6 +46,8 @@ extern "C"
{
#endif /* __cplusplus */
@ -310,7 +310,7 @@
#undef NCURSES_CONST
--- include/tic.h
+++ include/tic.h 2017-04-24 06:53:27.184085187 +0000
+++ include/tic.h 2017-05-10 11:59:56.041033232 +0000
@@ -205,12 +205,12 @@ struct alias
*/
@ -327,7 +327,7 @@
#define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames
+++ man/man_db.renames 2017-04-24 06:53:27.184085187 +0000
+++ man/man_db.renames 2017-05-10 11:59:56.041033232 +0000
@@ -163,6 +163,7 @@ term.7 term.7
term_variables.3x terminfo_variables.3ncurses
terminfo.5 terminfo.5
@ -345,8 +345,8 @@
#
getty.1 getty.8
--- man/ncurses.3x
+++ man/ncurses.3x 2017-04-24 06:53:27.184085187 +0000
@@ -134,6 +134,10 @@ after the shell environment variable \fB
+++ man/ncurses.3x 2017-05-10 11:59:56.041033232 +0000
@@ -137,6 +137,10 @@ after the shell environment variable \fB
[See \fBterminfo\fR(\*n) for further details.]
.SS Datatypes
.PP
@ -358,7 +358,7 @@
called \fIwindows\fR, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in
+++ misc/gen-pkgconfig.in 2017-04-24 06:53:27.184085187 +0000
+++ misc/gen-pkgconfig.in 2017-05-10 11:59:56.041033232 +0000
@@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
fi
@ -398,7 +398,7 @@
echo "** creating ${name}${suffix}.pc"
--- misc/ncurses-config.in
+++ misc/ncurses-config.in 2017-04-24 06:53:27.184085187 +0000
+++ misc/ncurses-config.in 2017-05-10 11:59:56.041033232 +0000
@@ -100,7 +100,7 @@ while test $# -gt 0; do
# compile/link
--cflags)
@ -409,7 +409,7 @@
fi
if test "${includedir}" != /usr/include ; then
--- misc/terminfo.src
+++ misc/terminfo.src 2017-04-24 07:10:12.780603866 +0000
+++ misc/terminfo.src 2017-05-12 06:29:16.720420832 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am,
cols#80,
@ -735,7 +735,21 @@
kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
@@ -6478,7 +6554,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
@@ -6396,6 +6472,13 @@ screen.xterm-xfree86|screen.xterm-new|sc
E3@, use=screen+italics, use=screen+fkeys, use=xterm-new,
#:screen.xterm|screen for modern xterm,
#: use=screen.xterm-new,
+screen.xterm|screen customized for modern xterm,
+ bce@, bw,
+ invis@, kIC@, kNXT@, kPRV@, meml@, memu@,
+ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
+ %t;7%;%?%p4%t;5%;%?%p5%t;2%;m,
+ E3@, use=screen+italics, use=screen+fkeys, use=xterm-suse,
+
# xterm-r6 does not really support khome/kend unless it is propped up by
# the translations resource.
screen.xterm-r6|screen customized for X11R6 xterm,
@@ -6478,7 +6561,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
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, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL,
@ -744,7 +758,7 @@
kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV,
kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH,
nel=\r\n, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m,
@@ -8337,7 +8413,7 @@ hp700-wy|HP700/41 emulating wyse30,
@@ -8337,7 +8420,7 @@ hp700-wy|HP700/41 emulating wyse30,
ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>,
sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>,
smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c,
@ -753,7 +767,7 @@
am, da, db, xhp,
cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8,
acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA,
@@ -11558,6 +11634,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
@@ -11558,6 +11641,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
# at support for the VT320 itself.
# Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu.
# (vt320-k3: I added <rmam>/<smam> based on the init string -- esr)
@ -761,7 +775,7 @@
vt320-k3|MS-Kermit 3.00's vt320 emulation,
am, eslok, hs, km, mir, msgr, xenl,
cols#80, it#8, lines#49, pb#9600, vt#3,
@@ -11567,7 +11644,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
@@ -11567,7 +11651,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@ -770,7 +784,7 @@
dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[
?5l,
@@ -15981,7 +16058,7 @@ ibm3101|i3101|IBM 3101-10,
@@ -15981,7 +16065,7 @@ ibm3101|i3101|IBM 3101-10,
cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ,
el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB,
kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH,
@ -779,7 +793,7 @@
is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B,
sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%;
%?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t
@@ -16239,7 +16316,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
@@ -16239,7 +16323,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
tbc=\E[3g,
# "Megapel" refers to the display adapter, which was used with the IBM RT
# aka IBM 6150.
@ -789,7 +803,7 @@
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
--- ncurses/Makefile.in
+++ ncurses/Makefile.in 2017-04-24 06:53:27.192085032 +0000
+++ ncurses/Makefile.in 2017-05-10 11:59:56.045033156 +0000
@@ -218,7 +218,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@
@ -800,7 +814,7 @@
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
--- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2017-04-24 06:53:27.192085032 +0000
+++ ncurses/curses.priv.h 2017-05-10 11:59:56.049033080 +0000
@@ -2079,6 +2079,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
@ -811,7 +825,7 @@
extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
--- ncurses/run_cmd.sh
+++ ncurses/run_cmd.sh 2017-04-24 06:53:27.192085032 +0000
+++ ncurses/run_cmd.sh 2017-05-10 11:59:56.049033080 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
@ -825,7 +839,7 @@
+
+exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2017-04-24 07:11:25.651194948 +0000
+++ ncurses/tinfo/MKfallback.sh 2017-05-10 11:59:56.049033080 +0000
@@ -68,6 +68,12 @@ else
tmp_info=
fi
@ -858,7 +872,7 @@
done
--- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2017-04-24 06:53:27.192085032 +0000
+++ ncurses/tinfo/access.c 2017-05-10 11:59:56.049033080 +0000
@@ -35,6 +35,9 @@
#include <ctype.h>
@ -901,7 +915,7 @@
_nc_access(const char *path, int mode)
{
--- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2017-04-24 06:53:27.192085032 +0000
+++ ncurses/tinfo/lib_setup.c 2017-05-10 11:59:56.049033080 +0000
@@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
} else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */
@ -913,7 +927,7 @@
result = 1; /* always broken */
} else if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2017-04-24 06:53:27.192085032 +0000
+++ ncurses/tinfo/read_entry.c 2017-05-10 11:59:56.049033080 +0000
@@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0;
int code;
@ -931,7 +945,7 @@
return (code);
}
--- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2017-04-24 06:53:27.192085032 +0000
+++ ncurses/tinfo/read_termcap.c 2017-05-10 11:59:56.049033080 +0000
@@ -322,14 +322,18 @@ _nc_getent(
*/
if (fd >= 0) {
@ -978,7 +992,7 @@
}
if (copied != 0)
--- test/test.priv.h
+++ test/test.priv.h 2017-04-24 06:53:27.192085032 +0000
+++ test/test.priv.h 2017-05-10 11:59:56.049033080 +0000
@@ -801,12 +801,12 @@ extern char *strnames[], *strcodes[], *s
#endif

View File

@ -1,3 +1,57 @@
-------------------------------------------------------------------
Mon May 15 10:07:56 UTC 2017 - werner@suse.de
- Add ncurses patch 20170513
+ add test/picsmap.c to fill in some testing issues not met by dots.
The initial version reads X bitmap (".xbm") files.
+ repair logic which forces a repaint where a color-pair's content is
changed (cf: 20170311).
+ improve tracemunch, showing screenXX pointers as names.
-------------------------------------------------------------------
Fri May 12 06:35:00 UTC 2017 - werner@suse.de
- Better screen support and workaround about missing terminfo entries
might be help on boo#812067 as well as on boo#935736 but may cause
boo#940459 (which should be fixed by screen its self!)
- New package terminfo-screen which includes some useful but troubling
terminfo database entries for screen.
-------------------------------------------------------------------
Wed May 10 12:56:39 UTC 2017 - werner@suse.de
- Disable the usage of getttynam(3) as under Linux this is not used
-------------------------------------------------------------------
Tue May 9 09:46:16 UTC 2017 - werner@suse.de
- Add ncurses patch 20170506
+ modify tic/infocmp display of numeric values to use hexadecimal when
they are "close" to a power of two, making the result more readable.
+ improve discussion of portability in curs_mouse.3x
+ change line-length for generated html/manpages to 78 columns from 65.
+ improve discussion of line-drawing characters in curs_add_wch.3x
(prompted by discussion with Lorinczy Zsigmond).
+ cleanup formatting of hackguide.html and ncurses-intro.html
+ add examples for WACS_D_PLUS and WACS_T_PLUS to test/ncurses.c
-------------------------------------------------------------------
Tue May 2 14:41:23 UTC 2017 - werner@suse.de
- Add ncurses patch 20170429
+ corrected a case where $with_gpm was set to "maybe" after CF_WITH_GPM,
overlooked in 20160528 fixes (report by Alexandre Bury).
+ improve a couple of test-program's help-messages.
+ corrected loop in rain.c from 20170415 changes.
+ modify winnstr and winchnstr to return error if the output pointer is
null, as well as adding a null pointer check of the window pointer
for better compatibility with other implementations.
+ improve discussion of NetBSD curses in scr_dump.5
+ modify LIMIT_TYPED macro in new_pair.h to avoid changing sign of the
value to be limited (reports by Darby Payne, Rob Boudreau).
+ update config.guess, config.sub from
http://git.savannah.gnu.org/cgit/config.git
-------------------------------------------------------------------
Mon Apr 24 08:15:55 UTC 2017 - werner@suse.de

View File

@ -103,6 +103,7 @@ reset -- terminal initialization utility
Summary: A terminal descriptions database
License: MIT
Group: System/Base
Recommends: terminfo-screeen = %{version}
Provides: ncurses:%{_datadir}/tabset
%description -n terminfo-base
@ -111,6 +112,19 @@ This database is the official successor to the 4.4BSD termcap file and
contains information about any known terminal. The ncurses library
makes use of this database to use terminals correctly.
%package -n terminfo-screen
Summary: A terminal descriptions database
License: MIT
Group: System/Base
Requires: terminfo-base
Provides: terminfo:%{_datadir}/terminfo/s/screen.konsole
%description -n terminfo-screen
This package includes some useful entries for the screen utility in the
terminfo database, which might introduce trouble if used over network
connections like ssh or slogin onto systems without those terminfo database
entries.
%package -n libncurses5
Summary: Terminal control library
License: MIT
@ -338,6 +352,10 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
trap 'rm -rf ${TMPDIR}' EXIT
export TMPDIR
#
# getttynam(3) as well as /etc/ttys are not used under Linux
#
sed -ri '/^getttynam\s*\\$/d' configure
#
# No --enable-term-driver as this had crashed last time
# in ncurses/tinfo/lib_setup.c due to the fact that
# _nc_globals.term_driver was a NULL function pointer as
@ -812,9 +830,12 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
%{terminfo r/rxvt-256color}
%{terminfo r/rxvt-unicode}
%{terminfo r/rxvt-unicode-256color}
%{terminfo s/screen+fkeys}
%{terminfo s/screen}
%{terminfo s/screen-w}
%{terminfo s/screen-16color}
%{terminfo s/screen-256color}
%{terminfo s/screen-bce}
%{terminfo s/screen-w}
%{terminfo s/sun}
%{terminfo s/switch}
%{terminfo u/unknown}
@ -833,10 +854,19 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
%{terminfo x/xterm-nic}
%{terminfo x/xterm-r6}
EOF
# Better screen support and workaround about missing terminfo entries
# might be help on boo#812067 as well as on boo#935736 but may cause
# boo#940459 (which should be fixed by screen its self!)
(cat > screen.list) <<-EOF
%{terminfo s/screen.gnome}
%{terminfo s/screen.konsole}
%{terminfo s/screen.linux}
%{terminfo s/screen.xterm}
EOF
find %{buildroot}%{tabset ""} %{buildroot}%{terminfo ""} \
\( -type f -or -type l \) | \
sed "s@^%{buildroot}@@g" | \
grep -v -F -x -f default.list \
grep -v -F -x -f default.list -f screen.list \
> extension.list
rm -f %{buildroot}%{_prefix}/lib/terminfo
mv pc/*.pc %{buildroot}%{_libdir}/pkgconfig/
@ -858,6 +888,10 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
%dir %{_datadir}/terminfo/
%dir %{_datadir}/terminfo/*/
%files -n terminfo-screen -f screen.list
%defattr(-,root,root)
%dir %{_datadir}/terminfo/
%files -n ncurses-utils
%defattr(-,root,root)
%{_bindir}/clear