Hello community,
here is the log from the commit of package ncurses for openSUSE:Factory
checked in at Mon Nov 16 09:52:53 CET 2009.
--------
--- ncurses/ncurses.changes 2009-01-07 11:18:04.000000000 +0100
+++ /mounts/work_src_done/STABLE/ncurses/ncurses.changes 2009-11-14 20:24:43.000000000 +0100
@@ -1,0 +2,6 @@
+Sat Nov 14 10:58:16 CET 2009 - pbaudis@suse.cz
+
+- Add doc/terminfo.src.bz2 reference to /etc/termcap
+- Update patches to apply with fuzz 0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ncurses.spec ++++++
--- /var/tmp/diff_new_pack.dc0edl/_old 2009-11-16 09:51:57.000000000 +0100
+++ /var/tmp/diff_new_pack.dc0edl/_new 2009-11-16 09:51:57.000000000 +0100
@@ -23,7 +23,7 @@
BuildRequires: gcc-c++ gpm
%define terminfo() %{_datadir}/%{0}/%{1}
%define tabset() %{_datadir}/%{0}/%{1}
-License: X11/MIT
+License: MIT License (or similar)
Group: System/Base
AutoReqProv: on
# bug437293
@@ -32,7 +32,7 @@
%endif
#
Version: 5.6
-Release: 90
+Release: 92
Summary: New curses Libraries
Url: http://invisible-island.net/ncurses/ncurses.html
Source0: ncurses-5.6.tar.bz2
@@ -74,7 +74,7 @@
Pavel Curtis
%package -n ncurses-utils
-License: X11/MIT
+License: MIT License (or similar)
Summary: Tools using the new curses libraries
Group: System/Base
Provides: ncurses:%{_bindir}/tput
@@ -104,7 +104,7 @@
Pavel Curtis
%package -n terminfo-base
-License: X11/MIT
+License: MIT License (or similar)
Summary: A terminal descriptions database
Group: System/Base
Provides: ncurses:%{_datadir}/tabset
@@ -126,7 +126,7 @@
%if %abi == 5
%package -n libncurses5
-License: X11/MIT
+License: MIT License (or similar)
Summary: The New curses Libraries
Group: System/Libraries
Requires: terminfo-base
@@ -157,7 +157,7 @@
%endif
%package -n libncurses6
-License: X11/MIT
+License: MIT License (or similar)
Summary: The New curses Libraries
Group: System/Libraries
Requires: terminfo-base
@@ -206,7 +206,7 @@
%package -n ncurses-devel
Summary: Include Files and Libraries mandatory for Development
-License: X11/MIT
+License: MIT License (or similar)
Group: Development/Libraries/C and C++
Provides: ncurses:%{_incdir}/ncurses.h
Requires: ncurses = %{version}-%{release}, %{_bindir}/tack
@@ -510,7 +510,8 @@
mkdir -p %{buildroot}%{_sysconfdir}
mkdir -p %{buildroot}%{_miscdir}
cd ncurses/
- sh ./run_cmd.sh tic -C -r ../misc/terminfo.src | grep -E -v '^#' > termcap
+ { echo "# See annotated version in %{_defaultdocdir}/ncurses/terminfo.src.bz2"
+ sh ./run_cmd.sh tic -C -r ../misc/terminfo.src | grep -E -v '^#'; } > termcap
# Gererate new termcap entries for various linux consoles
TERMCAP=termcap \
TERMINFO=%{buildroot}%{_datadir}/terminfo \
++++++ ncurses-5.3-printw.dif ++++++
--- /var/tmp/diff_new_pack.dc0edl/_old 2009-11-16 09:51:57.000000000 +0100
+++ /var/tmp/diff_new_pack.dc0edl/_new 2009-11-16 09:51:57.000000000 +0100
@@ -1,6 +1,8 @@
---- ncurses/base/lib_printw.c
-+++ ncurses/base/lib_printw.c Wed Jan 22 17:30:11 2003
-@@ -48,10 +48,12 @@
+Index: ncurses/base/lib_printw.c
+===================================================================
+--- ncurses/base/lib_printw.c.orig
++++ ncurses/base/lib_printw.c
+@@ -48,10 +48,12 @@ printw(const char *fmt,...)
int code;
#ifdef TRACE
@@ -16,7 +18,7 @@
#endif
va_start(argp, fmt);
-@@ -68,10 +70,12 @@
+@@ -68,10 +70,12 @@ wprintw(WINDOW *win, const char *fmt,...
int code;
#ifdef TRACE
@@ -32,7 +34,7 @@
#endif
va_start(argp, fmt);
-@@ -88,10 +92,12 @@
+@@ -88,10 +92,12 @@ mvprintw(int y, int x, const char *fmt,.
int code;
#ifdef TRACE
@@ -48,7 +50,7 @@
#endif
if ((code = move(y, x)) != ERR) {
-@@ -109,10 +115,12 @@
+@@ -109,10 +115,12 @@ mvwprintw(WINDOW *win, int y, int x, con
int code;
#ifdef TRACE
++++++ ncurses-5.6.dif ++++++
--- /var/tmp/diff_new_pack.dc0edl/_old 2009-11-16 09:51:57.000000000 +0100
+++ /var/tmp/diff_new_pack.dc0edl/_new 2009-11-16 09:51:57.000000000 +0100
@@ -1,5 +1,7 @@
---- .pkgextract
-+++ .pkgextract 2006-05-18 16:07:14.000000000 +0200
+Index: .pkgextract
+===================================================================
+--- /dev/null
++++ .pkgextract
@@ -0,0 +1,11 @@
+rm -fr tack
+rm -f Ada95/src/terminal_interface-curses.adb
@@ -12,8 +14,10 @@
+patch -p0 -s --suffix=.hs < ../ncurses-5.6-hash.dif
+patch -p0 -s --suffix=.tack < ../ncurses-5.6-tack.dif
+patch -p0 -s --suffix=.gpm < ../ncurses-5.6-gpm.dif
---- aclocal.m4
-+++ aclocal.m4 2008-04-08 17:08:00.277340000 +0200
+Index: aclocal.m4
+===================================================================
+--- aclocal.m4.orig
++++ aclocal.m4
@@ -391,7 +391,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out
@@ -23,7 +27,7 @@
#include
#if defined(__cplusplus)
-@@ -3088,12 +3088,15 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP
CF_EOF
if test -n "$cf_compress" ; then
-@@ -3198,9 +3201,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP
CF_EOF
if test -n "$cf_compress" ; then
-@@ -8405,9 +8408,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <
@@ -255,7 +261,7 @@
#include
#if defined(__cplusplus)
-@@ -15797,12 +15801,13 @@ if test "$with_termlib" != no ; then
+@@ -15799,12 +15803,13 @@ if test "$with_termlib" != no ; then
TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
@@ -270,9 +276,11 @@
TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
fi
---- configure.in
-+++ configure.in 2008-08-14 17:10:51.210017818 +0200
-@@ -1622,12 +1622,13 @@ if test "$with_termlib" != no ; then
+Index: configure.in
+===================================================================
+--- configure.in.orig
++++ configure.in
+@@ -1624,12 +1624,13 @@ if test "$with_termlib" != no ; then
TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
@@ -287,8 +295,10 @@
TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
fi
---- include/curses.h.in
-+++ include/curses.h.in 2008-04-09 15:44:06.583779000 +0200
+Index: include/curses.h.in
+===================================================================
+--- include/curses.h.in.orig
++++ include/curses.h.in
@@ -137,6 +137,8 @@ typedef unsigned @cf_cv_typeof_chtype@ c
typedef unsigned @cf_cv_typeof_mmask_t@ mmask_t;
#endif
@@ -298,8 +308,10 @@
#include
#include
#include /* we need va_list */
---- include/termcap.h.in
-+++ include/termcap.h.in 2006-05-18 16:07:15.000000000 +0200
+Index: include/termcap.h.in
+===================================================================
+--- include/termcap.h.in.orig
++++ include/termcap.h.in
@@ -46,6 +46,8 @@ extern "C"
{
#endif /* __cplusplus */
@@ -309,8 +321,10 @@
#include
#undef NCURSES_CONST
---- include/tic.h
-+++ include/tic.h 2006-05-18 16:07:15.000000000 +0200
+Index: include/tic.h
+===================================================================
+--- include/tic.h.orig
++++ include/tic.h
@@ -211,12 +211,12 @@ extern NCURSES_EXPORT(const struct alias
#define NOTFOUND ((struct name_table_entry *) 0)
@@ -326,8 +340,10 @@
#define CANCELLED_NUMERIC (-2)
#define CANCELLED_STRING (char *)(-1)
---- man/man_db.renames
-+++ man/man_db.renames 2006-05-18 16:07:15.000000000 +0200
+Index: man/man_db.renames
+===================================================================
+--- man/man_db.renames.orig
++++ man/man_db.renames
@@ -161,6 +161,8 @@ tput.1 tput.1
tset.1 tset.1
vprintf.3s vprintf.3
@@ -337,8 +353,10 @@
#
# Other:
tack.1m tack.1
---- man/ncurses.3x
-+++ man/ncurses.3x 2006-05-18 16:07:15.000000000 +0200
+Index: man/ncurses.3x
+===================================================================
+--- man/ncurses.3x.orig
++++ man/ncurses.3x
@@ -97,6 +97,10 @@ after the shell environment variable \fB
\fBtset(1)\fR is usually responsible for doing this.
[See \fBterminfo\fR(\*n) for further details.]
@@ -350,8 +368,10 @@
The \fBncurses\fR library permits manipulation of data structures,
called \fIwindows\fR, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen.
---- misc/ncurses-config.in
-+++ misc/ncurses-config.in 2008-04-10 11:36:57.986551686 +0200
+Index: misc/ncurses-config.in
+===================================================================
+--- misc/ncurses-config.in.orig
++++ misc/ncurses-config.in
@@ -78,7 +78,7 @@ while test $# -gt 0; do
if test "${prefix}/include" != /usr/include ; then
INCS="-I${prefix}/include"
@@ -361,8 +381,10 @@
INCS="$INCS -I${prefix}/include/${THIS}"
fi
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
---- misc/terminfo.src
-+++ misc/terminfo.src 2008-04-08 17:16:48.748977000 +0200
+Index: misc/terminfo.src
+===================================================================
+--- misc/terminfo.src.orig
++++ misc/terminfo.src
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am,
cols#80,
@@ -408,7 +430,7 @@
dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
if=/usr/share/tabset/vt100, il1=\E[L, ind=\ED$<20/>,
is2=\E[1;24r\E[24;1H, kbs=^H, kcub1=\E[D, kcud1=\E[B,
-@@ -2308,6 +2317,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul.
+@@ -2308,6 +2317,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul.
# to SMASH the 1k-barrier...
# From: Adam Thompson Sept 10 1995
# (vt320: uncommented <fsl> --esr)
@@ -512,7 +534,7 @@
#
@@ -3673,17 +3707,18 @@ konsole-256color|KDE console window with
# control/alt kf1 to kf12 \E[11;7~ to \E[24;7~
- # control/shit/alt kf1 to kf12 \E[11;8~ to \E[24;8~
+ # control/shift/alt kf1 to kf12 \E[11;8~ to \E[24;8~
#
+# Add cvvis
mlterm|multi lingual terminal emulator,
@@ -532,7 +554,7 @@
home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS,
is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
-@@ -3730,6 +3765,7 @@ mlterm+pcfkeys|fragment for PC-style fke
+@@ -3734,6 +3769,7 @@ mlterm+pcfkeys|fragment for PC-style fke
# rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM.
# Since rxvt is not really compatible with xterm, it should be configured as
# "rxvt" or "rxvt-color".
@@ -540,7 +562,7 @@
#
# removed dch/dch1 because they are inconsistent with bce/ech -TD
# remove km as per tack test -TD
-@@ -3741,13 +3777,14 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -3745,13 +3781,14 @@ rxvt-basic|rxvt terminal base (X Window
clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
@@ -558,7 +580,7 @@
rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
rmul=\E[24m,
rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
-@@ -3756,7 +3793,7 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -3760,7 +3797,7 @@ rxvt-basic|rxvt terminal base (X Window
sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h,
smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq,
@@ -567,7 +589,7 @@
# Key Codes from rxvt reference:
#
# Note: Shift + F1-F10 generates F11-F20
-@@ -3839,8 +3876,8 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -3843,8 +3880,8 @@ rxvt-basic|rxvt terminal base (X Window
# Removed kDN6, etc (control+shift) since rxvt does not implement this -TD
rxvt+pcfkeys|fragment for PC-style fkeys,
kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
@@ -578,7 +600,7 @@
kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
-@@ -3876,6 +3913,29 @@ rxvt-cygwin-native|rxvt terminal emulato
+@@ -3880,6 +3917,29 @@ rxvt-cygwin-native|rxvt terminal emulato
acsc=0\333+\257\,\256-\^`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330~\376,
use=rxvt-cygwin,
@@ -608,7 +630,7 @@
# This variant is supposed to work with rxvt 2.7.7 when compiled with
# NO_BRIGHTCOLOR defined. rxvt needs more work...
rxvt-16color|xterm with 16 colors like aixterm,
-@@ -3893,7 +3953,7 @@ mrxvt|multitabbed rxvt,
+@@ -3897,7 +3957,7 @@ mrxvt|multitabbed rxvt,
# Eterm 0.9.3
#
# removed kf0 which conflicts with kf10 -TD
@@ -617,7 +639,7 @@
# Eterm does not implement control/shift cursor keys such as kDN6, or kPRV/kNXT
# but does otherwise follow the rxvt+pcfkeys model -TD
# remove nonworking flash -TD
-@@ -3907,13 +3967,13 @@ Eterm|Eterm-color|Eterm with xterm-style
+@@ -3911,13 +3971,13 @@ Eterm|Eterm-color|Eterm with xterm-style
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@@ -633,7 +655,7 @@
kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M,
mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=,
-@@ -4249,7 +4309,7 @@ pty|4bsd pseudo teletype,
+@@ -4253,7 +4313,7 @@ pty|4bsd pseudo teletype,
smso=\Ea$, smul=\Ea!, use=cbunix,
# The codes supported by the term.el terminal emulation in GNU Emacs 19.30
@@ -642,7 +664,7 @@
am, mir, xenl,
cols#80, lines#24,
bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M,
-@@ -4262,6 +4322,13 @@ eterm|gnu emacs term.el terminal emulati
+@@ -4266,6 +4326,13 @@ eterm|gnu emacs term.el terminal emulati
rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m,
sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m,
smul=\E[4m,
@@ -656,7 +678,7 @@
# Entries for use by the `screen' program by Juergen Weigert,
# Michael Schroeder, Oliver Laumann. The screen and
-@@ -4290,7 +4357,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -4294,7 +4361,7 @@ screen|VT 100/ANSI X3.64 virtual termina
cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
@@ -665,7 +687,7 @@
kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, 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,
-@@ -4406,7 +4473,7 @@ screen2|old VT 100/ANSI X3.64 virtual te
+@@ -4424,7 +4491,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,
@@ -674,7 +696,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=^M^J, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m,
-@@ -6139,7 +6206,7 @@ hp700-wy|HP700/41 emulating wyse30,
+@@ -6157,7 +6224,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,
@@ -683,7 +705,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,
-@@ -9270,6 +9337,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit
+@@ -9288,6 +9355,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)
@@ -691,7 +713,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,
-@@ -9279,7 +9347,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio
+@@ -9297,7 +9365,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=^J, cuf=\E[%p1%dC, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
@@ -700,7 +722,7 @@
dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
flash=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l,
fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
-@@ -13554,7 +13622,7 @@ ibm3101|i3101|IBM 3101-10,
+@@ -13572,7 +13640,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=^J, kcub1=\ED, kcud1=\EB,
kcuf1=\EC, kcuu1=\EA, nel=^M^J, tbc=\EH,
@@ -709,7 +731,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%{80}%|%;%c%?%p9%t\E>A%e\E>B%;,
sgr0=\E4@\E>B, smacs=\E>A, smcup=\E>B, use=ibm3162,
-@@ -13782,7 +13850,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
+@@ -13800,7 +13868,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m,
tbc=\E[3g,
@@ -718,8 +740,10 @@
acsc=jjkkllmmnnqqttuuvvwwxx, blink@, bold@, s0ds=\E(B,
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 2008-04-09 15:57:41.084024000 +0200
+Index: ncurses/Makefile.in
+===================================================================
+--- ncurses/Makefile.in.orig
++++ ncurses/Makefile.in
@@ -183,7 +183,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@
@@ -729,19 +753,23 @@
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
sh $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
---- ncurses/curses.priv.h
-+++ ncurses/curses.priv.h 2006-05-18 16:07:15.000000000 +0200
-@@ -1560,6 +1560,8 @@ extern NCURSES_EXPORT(WINDOW *) _nc_make
- extern NCURSES_EXPORT(char *) _nc_trace_buf (int, size_t);
- extern NCURSES_EXPORT(char *) _nc_trace_bufcat (int, const char *);
+Index: ncurses/curses.priv.h
+===================================================================
+--- ncurses/curses.priv.h.orig
++++ ncurses/curses.priv.h
+@@ -1586,6 +1586,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_
+ extern NCURSES_EXPORT(char *) _nc_tracechar (SCREEN *, int);
+ extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
extern NCURSES_EXPORT(int) _nc_access (const char *, int);
+extern NCURSES_EXPORT(void) _nc_fsid(void);
+extern NCURSES_EXPORT(void) _nc_fseid(void);
extern NCURSES_EXPORT(int) _nc_baudrate (int);
extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
---- ncurses/run_cmd.sh
-+++ ncurses/run_cmd.sh 2006-05-18 16:07:15.000000000 +0200
+Index: ncurses/run_cmd.sh
+===================================================================
+--- /dev/null
++++ ncurses/run_cmd.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
@@ -754,8 +782,10 @@
+export PATH LD_LIBRARY_PATH
+
+exec ${1+"$@"}
---- ncurses/tinfo/MKfallback.sh
-+++ ncurses/tinfo/MKfallback.sh 2006-05-18 16:07:15.000000000 +0200
+Index: ncurses/tinfo/MKfallback.sh
+===================================================================
+--- ncurses/tinfo/MKfallback.sh.orig
++++ ncurses/tinfo/MKfallback.sh
@@ -57,6 +57,12 @@ else
tmp_info=
fi
@@ -787,8 +817,10 @@
comma=","
done
---- ncurses/tinfo/access.c
-+++ ncurses/tinfo/access.c 2006-05-18 16:07:15.000000000 +0200
+Index: ncurses/tinfo/access.c
+===================================================================
+--- ncurses/tinfo/access.c.orig
++++ ncurses/tinfo/access.c
@@ -37,6 +37,9 @@
#include
@@ -830,9 +862,11 @@
NCURSES_EXPORT(int)
_nc_access(const char *path, int mode)
{
---- ncurses/tinfo/lib_setup.c
-+++ ncurses/tinfo/lib_setup.c 2006-05-18 17:52:22.000000000 +0200
-@@ -454,6 +454,9 @@ _nc_locale_breaks_acs(void)
+Index: ncurses/tinfo/lib_setup.c
+===================================================================
+--- ncurses/tinfo/lib_setup.c.orig
++++ ncurses/tinfo/lib_setup.c
+@@ -470,6 +470,9 @@ _nc_locale_breaks_acs(TERMINAL * termp)
if ((env = getenv("NCURSES_NO_UTF8_ACS")) != 0) {
return atoi(env);
} else if ((env = getenv("TERM")) != 0) {
@@ -842,9 +876,11 @@
if (strstr(env, "linux"))
return 1; /* always broken */
if (strstr(env, "screen") != 0
---- ncurses/tinfo/read_entry.c
-+++ ncurses/tinfo/read_entry.c 2006-05-18 16:07:15.000000000 +0200
-@@ -366,6 +366,7 @@ _nc_read_file_entry(const char *const fi
+Index: ncurses/tinfo/read_entry.c
+===================================================================
+--- ncurses/tinfo/read_entry.c.orig
++++ ncurses/tinfo/read_entry.c
+@@ -368,6 +368,7 @@ _nc_read_file_entry(const char *const fi
int limit;
char buffer[MAX_ENTRY_SIZE + 1];
@@ -852,7 +888,7 @@
if (_nc_access(filename, R_OK) < 0
|| (fd = open(filename, O_RDONLY | O_BINARY)) < 0) {
T(("cannot open terminfo %s (errno=%d)", filename, errno));
-@@ -382,6 +383,7 @@ _nc_read_file_entry(const char *const fi
+@@ -384,6 +385,7 @@ _nc_read_file_entry(const char *const fi
}
close(fd);
}
@@ -860,8 +896,10 @@
return (code);
}
---- ncurses/tinfo/read_termcap.c
-+++ ncurses/tinfo/read_termcap.c 2006-05-18 16:07:15.000000000 +0200
+Index: ncurses/tinfo/read_termcap.c
+===================================================================
+--- ncurses/tinfo/read_termcap.c.orig
++++ ncurses/tinfo/read_termcap.c
@@ -319,14 +319,18 @@ _nc_getent(
*/
if (fd >= 0) {
@@ -907,9 +945,11 @@
}
}
if (copied != 0)
---- test/test.priv.h
-+++ test/test.priv.h 2006-05-18 16:07:19.000000000 +0200
-@@ -472,12 +472,12 @@ extern int optind;
+Index: test/test.priv.h
+===================================================================
+--- test/test.priv.h.orig
++++ test/test.priv.h
+@@ -473,12 +473,12 @@ extern int optind;
#endif
/* out-of-band values for representing absent capabilities */
++++++ ncurses-5.6-fallback.dif ++++++
--- /var/tmp/diff_new_pack.dc0edl/_old 2009-11-16 09:51:57.000000000 +0100
+++ /var/tmp/diff_new_pack.dc0edl/_new 2009-11-16 09:51:57.000000000 +0100
@@ -1,6 +1,8 @@
---- ncurses/tinfo/lib_setup.c
-+++ ncurses/tinfo/lib_setup.c 2008-11-14 18:54:38.539715994 +0100
-@@ -566,7 +566,7 @@ _nc_setupterm(NCURSES_CONST char *tname,
+Index: ncurses/tinfo/lib_setup.c
+===================================================================
+--- ncurses/tinfo/lib_setup.c.orig
++++ ncurses/tinfo/lib_setup.c
+@@ -563,7 +563,7 @@ _nc_setupterm(NCURSES_CONST char *tname,
const TERMTYPE *fallback = _nc_fallback(tname);
if (fallback) {
++++++ ncurses-5.6-gpm.dif ++++++
--- /var/tmp/diff_new_pack.dc0edl/_old 2009-11-16 09:51:57.000000000 +0100
+++ /var/tmp/diff_new_pack.dc0edl/_new 2009-11-16 09:51:58.000000000 +0100
@@ -1,6 +1,8 @@
---- ncurses/base/lib_mouse.c
-+++ ncurses/base/lib_mouse.c 2008-04-11 17:48:00.119274018 +0200
-@@ -352,6 +352,11 @@ enable_xterm_mouse(int enable)
+Index: ncurses/base/lib_mouse.c
+===================================================================
+--- ncurses/base/lib_mouse.c.orig
++++ ncurses/base/lib_mouse.c
+@@ -359,6 +359,11 @@ enable_xterm_mouse(SCREEN *sp, int enabl
static int
allow_gpm_mouse(void)
{
@@ -12,7 +14,7 @@
/* GPM does printf's without checking if stdout is a terminal */
if (isatty(fileno(stdout))) {
char *env = getenv("TERM");
-@@ -359,7 +364,7 @@ allow_gpm_mouse(void)
+@@ -366,7 +371,7 @@ allow_gpm_mouse(void)
* it should pass xterm events through. There is no real advantage
* in allowing GPM to do this.
*/
@@ -21,9 +23,11 @@
return TRUE;
}
return FALSE;
---- ncurses/curses.priv.h
-+++ ncurses/curses.priv.h 2008-04-11 17:33:58.695131162 +0200
-@@ -397,6 +397,9 @@ typedef struct {
+Index: ncurses/curses.priv.h
+===================================================================
+--- ncurses/curses.priv.h.orig
++++ ncurses/curses.priv.h
+@@ -487,6 +487,9 @@ typedef struct {
#if USE_GPM_SUPPORT
#undef buttons /* term.h defines this, and gpm uses it! */
#include
++++++ ncurses-5.6-overwrite.dif ++++++
--- /var/tmp/diff_new_pack.dc0edl/_old 2009-11-16 09:51:58.000000000 +0100
+++ /var/tmp/diff_new_pack.dc0edl/_new 2009-11-16 09:51:58.000000000 +0100
@@ -1,12 +1,14 @@
Make ncurses-config report the correct directory for ncurses.h.
---- configure 2007/10/29 13:59:32 1.9
-+++ configure 2007/10/29 14:18:12
-@@ -5253,6 +5253,7 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -5336,6 +5336,7 @@ else
fi;
- echo "$as_me:5254: result: $with_overwrite" >&5
+ echo "$as_me:5337: result: $with_overwrite" >&5
echo "${ECHO_T}$with_overwrite" >&6
+WITH_OVERWRITE="$with_overwrite"
- echo "$as_me:5257: checking if external terminfo-database is used" >&5
+ echo "$as_me:5340: checking if external terminfo-database is used" >&5
echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
++++++ ncurses-5.6-pthread.dif ++++++
--- /var/tmp/diff_new_pack.dc0edl/_old 2009-11-16 09:51:58.000000000 +0100
+++ /var/tmp/diff_new_pack.dc0edl/_new 2009-11-16 09:51:58.000000000 +0100
@@ -1,5 +1,7 @@
---- configure
-+++ configure 2008-08-15 17:26:58.354794367 +0200
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
@@ -9310,6 +9310,7 @@ if test "$with_pthread" = "yes" ; then
EOF
@@ -26,8 +28,10 @@
s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t
s,@cf_cv_enable_opaque@,$cf_cv_enable_opaque,;t t
s,@NCURSES_OPAQUE@,$NCURSES_OPAQUE,;t t
---- configure.in
-+++ configure.in 2008-08-15 17:24:08.626825950 +0200
+Index: configure.in
+===================================================================
+--- configure.in.orig
++++ configure.in
@@ -972,9 +972,11 @@ test "$with_colorfgbg" = yes && AC_DEFIN
# This is still experimental (20080329), but should ultimately be moved to
# the script-block --with-normal, etc.
@@ -49,8 +53,10 @@
AC_DEFINE(USE_REENTRANT)
CF_NCURSES_ABI_6
else
---- ncurses/curses.priv.h
-+++ ncurses/curses.priv.h 2008-08-15 14:54:39.906243654 +0200
+Index: ncurses/curses.priv.h
+===================================================================
+--- ncurses/curses.priv.h.orig
++++ ncurses/curses.priv.h
@@ -330,6 +330,7 @@ NCURSES_EXPORT(int *) _nc_ptr_Cols (void
#if USE_REENTRANT
@@ -128,8 +134,10 @@
#endif
} NCURSES_GLOBALS;
---- ncurses/base/lib_getch.c
-+++ ncurses/base/lib_getch.c 2008-08-15 14:59:26.569224183 +0200
+Index: ncurses/base/lib_getch.c
+===================================================================
+--- ncurses/base/lib_getch.c.orig
++++ ncurses/base/lib_getch.c
@@ -260,7 +260,7 @@ recur_wrefresh(WINDOW *win)
{
#ifdef USE_PTHREADS
@@ -148,8 +156,10 @@
SCREEN *save_SP;
/* temporarily switch to the window's screen to get cooked input */
---- ncurses/base/lib_initscr.c
-+++ ncurses/base/lib_initscr.c 2008-08-15 14:37:44.598653367 +0200
+Index: ncurses/base/lib_initscr.c
+===================================================================
+--- ncurses/base/lib_initscr.c.orig
++++ ncurses/base/lib_initscr.c
@@ -57,7 +57,9 @@ initscr(void)
START_TRACE();
T((T_CALLED("initscr()")));
@@ -160,8 +170,10 @@
/* Portable applications must not call initscr() more than once */
if (!_nc_globals.init_screen) {
_nc_globals.init_screen = TRUE;
---- ncurses/base/lib_newterm.c
-+++ ncurses/base/lib_newterm.c 2008-08-15 14:37:33.293589963 +0200
+Index: ncurses/base/lib_newterm.c
+===================================================================
+--- ncurses/base/lib_newterm.c.orig
++++ ncurses/base/lib_newterm.c
@@ -130,6 +130,7 @@ newterm(NCURSES_CONST char *name, FILE *
START_TRACE();
T((T_CALLED("newterm(\"%s\",%p,%p)"), name, ofp, ifp));
@@ -170,8 +182,10 @@
_nc_lock_global(curses);
current = SP;
---- ncurses/tinfo/lib_data.c
-+++ ncurses/tinfo/lib_data.c 2008-08-15 14:42:37.974271725 +0200
+Index: ncurses/tinfo/lib_data.c
+===================================================================
+--- ncurses/tinfo/lib_data.c.orig
++++ ncurses/tinfo/lib_data.c
@@ -181,6 +181,7 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_
PTHREAD_MUTEX_INITIALIZER, /* mutex_tst_tracef */
PTHREAD_MUTEX_INITIALIZER, /* mutex_tracef */
@@ -260,8 +274,10 @@
+}
+#endif
#endif /* USE_PTHREADS */
---- ncurses/tinfo/lib_options.c
-+++ ncurses/tinfo/lib_options.c 2008-08-15 15:02:29.662454211 +0200
+Index: ncurses/tinfo/lib_options.c
+===================================================================
+--- ncurses/tinfo/lib_options.c.orig
++++ ncurses/tinfo/lib_options.c
@@ -245,7 +245,7 @@ _nc_keypad(SCREEN *sp, bool flag)
* has wgetch() reading in more than one thread. putp() and below
* may use SP explicitly.
@@ -271,8 +287,10 @@
SCREEN *save_sp;
/* cannot use use_screen(), since that is not in tinfo library */
---- ncurses/trace/lib_trace.c
-+++ ncurses/trace/lib_trace.c 2008-08-15 14:26:03.884728534 +0200
+Index: ncurses/trace/lib_trace.c
+===================================================================
+--- ncurses/trace/lib_trace.c.orig
++++ ncurses/trace/lib_trace.c
@@ -180,6 +180,9 @@ _nc_va_tracef(const char *fmt, va_list a
* Rather than add the complication of a per-thread stack, just
* show the thread-id in each line of the trace.
@@ -283,8 +301,10 @@
fprintf(TraceFP, "%#lx:", (long) pthread_self());
#endif
if (before || after) {
---- test/Makefile.in
-+++ test/Makefile.in 2008-08-15 17:21:56.826424899 +0200
+Index: test/Makefile.in
+===================================================================
+--- test/Makefile.in.orig
++++ test/Makefile.in
@@ -95,7 +95,7 @@ LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(TES
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_DEFAULT)
++++++ ncurses-5.6-tack.dif ++++++
--- /var/tmp/diff_new_pack.dc0edl/_old 2009-11-16 09:51:58.000000000 +0100
+++ /var/tmp/diff_new_pack.dc0edl/_new 2009-11-16 09:51:58.000000000 +0100
@@ -1,5 +1,7 @@
---- tack-1.06/Makefile.in
-+++ tack-1.06/Makefile.in 2008-08-14 13:57:00.930682483 +0200
+Index: tack-1.06/Makefile.in
+===================================================================
+--- tack-1.06/Makefile.in.orig
++++ tack-1.06/Makefile.in
@@ -98,7 +98,7 @@ ABI_VERSION = @cf_cv_abi_version@
LOCAL_LIBDIR = @top_builddir@/lib
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org