diff --git a/ncurses-5.9-overwrite.dif b/ncurses-5.9-overwrite.dif index f03f5cc..72089a1 100644 --- a/ncurses-5.9-overwrite.dif +++ b/ncurses-5.9-overwrite.dif @@ -1,6 +1,6 @@ --- configure.in +++ configure.in 2010-10-12 08:14:31.000000000 +0000 -@@ -415,6 +415,7 @@ AC_ARG_ENABLE(overwrite, +@@ -413,6 +413,7 @@ AC_ARG_ENABLE(overwrite, [with_overwrite=$enableval], [if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi]) AC_MSG_RESULT($with_overwrite) @@ -9,12 +9,12 @@ AC_MSG_CHECKING(if external terminfo-database is used) AC_ARG_ENABLE(database, --- configure -+++ configure 2010-10-11 14:04:42.000000000 +0000 -@@ -6314,6 +6314,7 @@ else ++++ configure 2012-01-30 16:19:43.071146239 +0000 +@@ -6336,6 +6336,7 @@ else fi; - echo "$as_me:6315: result: $with_overwrite" >&5 + echo "$as_me:6337: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 +WITH_OVERWRITE="$with_overwrite" - echo "$as_me:6318: checking if external terminfo-database is used" >&5 + echo "$as_me:6340: checking if external terminfo-database is used" >&5 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 diff --git a/ncurses-5.9-patches.tar.bz2 b/ncurses-5.9-patches.tar.bz2 index 7dc4355..10b7868 100644 --- a/ncurses-5.9-patches.tar.bz2 +++ b/ncurses-5.9-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa9d8b7d72f70b2e20b8327828f3f915e5ed91dfb8a2123a0ba5bdffd890ad2d -size 611603 +oid sha256:66352fa136203c278a221b72e3d2097d8a38172a8b0bd1fc3f879b25ef1c9b6b +size 872767 diff --git a/ncurses-5.9.dif b/ncurses-5.9.dif index 10d634f..6037f01 100644 --- a/ncurses-5.9.dif +++ b/ncurses-5.9.dif @@ -9,7 +9,7 @@ #include #if defined(__cplusplus) -@@ -4165,12 +4165,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 <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -4295,9 +4298,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 <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -10741,9 +10744,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man < -+// #include // conflict with exit declaration ++/* #include conflict with exit declaration */ #include #if defined(__cplusplus) -@@ -19808,6 +19812,7 @@ if test "$with_termlib" != no ; then - TINFO_LIBS="$TEST_ARGS" +@@ -18947,7 +18951,7 @@ else + #line 18946 "configure" + #include "confdefs.h" + +-#include ++/* #include conflict with exit declaration */ + #include + + #if defined(__cplusplus) +@@ -19898,6 +19902,7 @@ if test "$with_termlib" != no ; then + TINFO_LDFLAGS="-L${LIB_DIR}" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" fi -+ TINFO_ARGS="$TINFO_ARGS -L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}" ++ TINFO_ARGS="$TINFO_ARGS -L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}" else # the next lines are needed for linking libtic over libncurses TINFO_NAME=${LIB_NAME} @@ -335,9 +344,9 @@ # Other: tack.1m tack.1 --- man/ncurses.3x -+++ man/ncurses.3x 2006-05-18 14:07:15.000000000 +0000 ++++ man/ncurses.3x 2012-01-30 16:44:35.439646557 +0000 @@ -113,6 +113,10 @@ after the shell environment variable \fB - \fBtset(1)\fR is usually responsible for doing this. + \fB@TSET@(1)\fR is usually responsible for doing this. [See \fBterminfo\fR(\*n) for further details.] .PP +Beware: the terminal your program is running may or may not have @@ -348,7 +357,7 @@ 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 2011-11-17 12:46:48.587146941 +0000 ++++ misc/ncurses-config.in 2011-11-17 12:46:49.000000000 +0000 @@ -73,7 +73,7 @@ while test $# -gt 0; do # compile/link --cflags) @@ -359,7 +368,7 @@ fi if test "${includedir}" != /usr/include ; then --- misc/terminfo.src -+++ misc/terminfo.src 2011-11-17 12:48:39.183647547 +0000 ++++ misc/terminfo.src 2011-11-17 12:48:39.000000000 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -388,7 +397,7 @@ # Linux 2.6.x has a fix for SI/SO to work with UTF-8 encoding added here: # http://lkml.indiana.edu/hypermail/linux/kernel/0602.2/0868.html -@@ -2441,6 +2449,7 @@ vt132|DEC vt132, +@@ -2459,6 +2467,7 @@ vt132|DEC vt132, # at the top of the keyboard. The "DO" key is used as F10 to avoid conflict # with the key marked (ESC) on the vt220. See vt220d for an alternate mapping. # PF1--PF4 are used as F1--F4. @@ -396,7 +405,7 @@ # vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, OTbs, OTpt, am, mir, xenl, xon, -@@ -2450,7 +2459,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e +@@ -2468,7 +2477,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l, clear=\E[H\E[2J$<50>, cnorm=\E[?25h, cr=^M, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=\E[B, cuf1=\E[C, @@ -405,7 +414,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, -@@ -2598,6 +2607,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. +@@ -2616,6 +2625,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. # to SMASH the 1k-barrier... # From: Adam Thompson Sept 10 1995 # (vt320: uncommented --esr) @@ -413,7 +422,7 @@ vt320|vt300|dec vt320 7 bit terminal, am, eslok, hs, mir, msgr, xenl, cols#80, lines#24, wsl#80, -@@ -2607,7 +2617,7 @@ vt320|vt300|dec vt320 7 bit terminal, +@@ -2625,7 +2635,7 @@ vt320|vt300|dec vt320 7 bit terminal, 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, @@ -422,7 +431,7 @@ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, fsl=\E[0$}, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, -@@ -3041,13 +3051,14 @@ putty-vt100|VT100+ keyboard layout, +@@ -3081,13 +3091,14 @@ putty-sco|putty with SCO function keys, # retrieving the window title, and for setting the window size (i.e., using # "resize -s"), though it does not pass SIGWINCH to the application if the # user resizes the window with the mouse. @@ -438,7 +447,7 @@ dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, flash=\E[?5h\E[?5l$<200/>, hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, kdch1=\E[3~, kf1=\E[11~, -@@ -3248,6 +3259,7 @@ xterm-r6|xterm-old|xterm X11R6 version, +@@ -3288,6 +3299,7 @@ xterm-r6|xterm-old|xterm X11R6 version, use=vt100+enq, # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up. # The name has been changed and some aliases have been removed. @@ -446,7 +455,7 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System), OTbs, am, bce, km, mir, msgr, xenl, cols#80, it#8, lines#24, ncv@, -@@ -3257,7 +3269,7 @@ xterm-xf86-v32|xterm terminal emulator ( +@@ -3297,7 +3309,7 @@ xterm-xf86-v32|xterm terminal emulator ( 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, @@ -455,7 +464,7 @@ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, -@@ -3724,8 +3736,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -3764,8 +3776,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -482,7 +491,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -3895,7 +3925,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -3935,7 +3965,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -491,7 +500,7 @@ bce, kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -4043,10 +4073,14 @@ mgt|Multi GNOME Terminal, +@@ -4083,10 +4113,14 @@ mgt|Multi GNOME Terminal, #### KDE # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce # or not is debatable). @@ -507,7 +516,7 @@ # Konsole 1.0.1 # (formerly known as kvt) # -@@ -4162,14 +4196,14 @@ konsole-256color|KDE console window with +@@ -4202,14 +4236,14 @@ konsole-256color|KDE console window with mlterm|multi lingual terminal emulator, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT, colors#8, cols#80, it#8, lines#24, pairs#64, @@ -525,7 +534,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>, -@@ -4224,6 +4258,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -4264,6 +4298,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 # 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". @@ -533,7 +542,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -4235,13 +4270,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -4275,13 +4310,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, @@ -551,7 +560,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, -@@ -4250,7 +4286,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -4290,7 +4326,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, @@ -560,7 +569,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -4333,8 +4369,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -4373,8 +4409,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, @@ -571,7 +580,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~, -@@ -4372,6 +4408,39 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -4412,6 +4448,39 @@ rxvt-cygwin-native|rxvt terminal emulato acsc=+\257\,\256-\^0\333`\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, @@ -611,7 +620,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, -@@ -4401,7 +4470,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -4441,7 +4510,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -620,7 +629,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 -@@ -4415,13 +4484,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -4455,13 +4524,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, @@ -636,7 +645,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=, -@@ -4850,7 +4919,7 @@ pty|4bsd pseudo teletype, +@@ -4890,7 +4959,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 @@ -645,7 +654,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, -@@ -4863,6 +4932,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -4903,6 +4972,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, @@ -659,7 +668,7 @@ # The codes supported by the term.el terminal emulation in GNU Emacs 22.2 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, -@@ -4911,7 +4987,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -4951,7 +5027,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@, @@ -668,7 +677,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, -@@ -5090,7 +5166,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -5130,7 +5206,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, @@ -677,7 +686,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, -@@ -6809,7 +6885,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -6850,7 +6926,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, @@ -686,7 +695,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, -@@ -9940,6 +10016,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -9981,6 +10057,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 / based on the init string -- esr) @@ -694,7 +703,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, -@@ -9949,7 +10026,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -9990,7 +10067,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, @@ -703,7 +712,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, -@@ -14225,7 +14302,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -14267,7 +14344,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, @@ -712,7 +721,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, -@@ -14453,7 +14530,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -14495,7 +14572,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, @@ -734,7 +743,7 @@ sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ --- ncurses/curses.priv.h +++ ncurses/curses.priv.h 2006-05-18 14:07:15.000000000 +0000 -@@ -1926,6 +1926,8 @@ extern NCURSES_EXPORT(char *) _nc_trace_ +@@ -1935,6 +1935,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); @@ -864,7 +873,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2011-11-17 12:50:07.503147538 +0000 ++++ ncurses/tinfo/read_termcap.c 2011-11-17 12:50:08.000000000 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { diff --git a/ncurses-rpmlintrc b/ncurses-rpmlintrc index 9bca98c..656320f 100644 --- a/ncurses-rpmlintrc +++ b/ncurses-rpmlintrc @@ -1 +1,4 @@ addFilter(".*files-duplicate.*") +addFilter(".*shared-lib-calls-exit.*") +addFilter(".*non-etc-or-var-file-marked-as-conffile.*") +addFilter(".*macro-in-comment.*jobs.*") diff --git a/ncurses.changes b/ncurses.changes index 0ce292c..1d46821 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,75 @@ +------------------------------------------------------------------- +Mon Jan 30 16:13:37 UTC 2012 - werner@suse.de + +- Add ncurses patch 5.9.20120128 + + add mach-gnu (Debian #614316, patch by Samuel Thibault) + + add mach-gnu-color, tweaks to mach-gnu terminfo -TD + + make sgr for sun-color agree with smso -TD + + make sgr for prism9 agree with other caps -TD + + make sgr for icl6404 agree with other caps -TD + + make sgr for ofcons agree with other caps -TD + + make sgr for att5410v1, att4415, att620 agree with other caps -TD + + make sgr for aaa-unk, aaa-rv agree with other caps -TD + + make sgr for avt-ns agree with other caps -TD + + amend fix intended to separate fixups for acsc to allow "tic -cv" to + give verbose warnings (cf: 20110730). + + modify misc/gen-edit.sh to make the location of the tabset directory + consistent with misc/Makefile.in, i.., using ${datadir}/tabset + (Debian #653435, patch by Sven Joachim). +- Add ncurses patch 5.9.20120121 + + add --with-lib-prefix option to allow configuring for old/new flavors + of OS/2 EMX. + + modify check for gnat version to allow for year, as used in FreeBSD + port. + + modify check_existence() in db_iterator.c to simply check if the + path is a directory or file, according to the need. Checking for + directory size also gives no usable result with OS/2 (cf: 20120107). + + support OS/2 kLIBC (patch by KO Myung-Han). + +------------------------------------------------------------------- +Mon Jan 16 16:36:44 UTC 2012 - werner@suse.de + +- Add ncurses patch 5.9.20120114 + * several improvements to test/movewindow.c (prompted by discussion on + Linux Mint forum): +- Add ncurses patch 5.9.20120107 + * various improvments for MinGW (Juergen Pfeifer): +- Add ncurses patch 5.9.20111231 + * modify toe's report when -a and -s options are combined, to add + a column showing which entries belong to a given database. + * add -s option to toe, to sort its output. + * modify progs/toe.c, simplifying use of db-iterator results to use + caching improvements from 20111001 and 20111126. + * correct generation of pc-files when ticlib or termlib options are + given to rename the corresponding tic- or tinfo-libraries (report + by Sven Joachim). +- Add ncurses patch 5.9.20111224 + * document a portability issue with tput, i.e., that scripts which work + with ncurses may fail in other implementations that do no parameter + analysis. + * add putty-sco entry -TD +- Add ncurses patch 5.9.20111217 + * review/fix places in manpages where --program-prefix configure option + was not being used. + * add -D option to infocmp, to show the database locations that it + could use. + * fix build for the special case where term-driver, ticlib and termlib + are all enabled. The terminal driver depends on a few features in + the base ncurses library, so tic's dependencies include both ncurses + and termlib. + * fix build work for term-driver when --enable-wgetch-events option is + enabled. + * use types to fix some questionable casts to void*. +- Add ncurses patch 5.9.20111210 + * modify configure script to check if thread library provides + pthread_mutexattr_settype(), e.g., not provided by Solaris 2.6 + * modify configure script to suppress check to define _XOPEN_SOURCE + for IRIX64, since its header files have a conflict versus + _SGI_SOURCE. + * modify configure script to add ".pc" files for tic- and + tinfo-libraries, which were omitted in recent change (cf: 20111126). + * fix inconsistent checks on $PKG_CONFIG variable in configure script. + ------------------------------------------------------------------- Tue Dec 20 11:05:51 UTC 2011 - coolo@suse.com diff --git a/ncurses.spec b/ncurses.spec index 8ff3c2b..b1431c2 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -131,7 +131,7 @@ License: MIT Group: System/Libraries Requires: terminfo-base Provides: ncurses = %{version} -Obsoletes: ncurses <= %{version} +Obsoletes: ncurses < %{version} Recommends: ncurses-utils = %{version} # bug437293 %ifarch ppc64 @@ -208,9 +208,10 @@ Group: Development/Libraries/C and C++ Provides: ncurses:%{_incdir}/ncurses.h Requires: ncurses = %{version}-%{release}, %{_bindir}/tack %if %abi >= 6 -Requires: libncurses6 +Requires: libncurses6 = %{version}-%{release} %else -Requires: libncurses5 libncurses6 +Requires: libncurses5 = %{version}-%{release} +Requires: libncurses6 = %{version}-%{release} %endif # bug437293 %ifarch ppc64