diff --git a/ncurses-5.9-overwrite.dif b/ncurses-5.9-overwrite.dif index c2edc6d..0aad13c 100644 --- a/ncurses-5.9-overwrite.dif +++ b/ncurses-5.9-overwrite.dif @@ -15,11 +15,11 @@ AC_ARG_ENABLE(database, --- configure +++ configure 2013-09-30 09:17:52.000000000 +0000 -@@ -6799,6 +6799,7 @@ else +@@ -6956,6 +6956,7 @@ else fi; - echo "$as_me:6924: result: $with_overwrite" >&5 + echo "$as_me:6957: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 +WITH_OVERWRITE="$with_overwrite" - echo "$as_me:6927: checking if external terminfo-database is used" >&5 + echo "$as_me:6960: 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 50c0619..16608e5 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:d54f78835340f13079d63340ed77e3813dd6bae2c464857bc8c07dc11b822084 -size 4669994 +oid sha256:55d11c02a714ba62a8f6bc495109006a11ef187a10f28fb9b7b85305ab77c67b +size 4781232 diff --git a/ncurses-5.9.dif b/ncurses-5.9.dif index 4f68b23..7e37862 100644 --- a/ncurses-5.9.dif +++ b/ncurses-5.9.dif @@ -7,7 +7,7 @@ include/tic.h | 4 - man/man_db.renames | 2 man/ncurses.3x | 4 + - misc/gen-pkgconfig.in | 9 ++ + misc/gen-pkgconfig.in | 7 +- misc/ncurses-config.in | 2 misc/terminfo.src | 131 ++++++++++++++++++++++++++++++++++--------- ncurses/Makefile.in | 2 @@ -19,11 +19,11 @@ ncurses/tinfo/read_entry.c | 2 ncurses/tinfo/read_termcap.c | 21 ++++-- test/test.priv.h | 4 - - 20 files changed, 241 insertions(+), 80 deletions(-) + 20 files changed, 240 insertions(+), 79 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2015-04-27 10:47:03.829518959 +0000 -@@ -523,7 +523,7 @@ AC_MSG_CHECKING([for size of bool]) ++++ aclocal.m4 2015-04-27 10:47:04.000000000 +0000 +@@ -554,7 +554,7 @@ AC_MSG_CHECKING([for size of bool]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out AC_TRY_RUN([ @@ -32,7 +32,7 @@ #include #if defined(__cplusplus) -@@ -4476,12 +4476,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 -@@ -4606,9 +4609,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 -@@ -11423,9 +11426,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man </dev/null ; then reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}" @@ -392,26 +392,17 @@ desc="$desc add-on library" fi -@@ -107,6 +110,8 @@ do - if test $name != $TINFO_NAME ; then - test -n "$reqs" && reqs="$reqs, " - reqs="${reqs}${SUB_LIBRARY}${suffix}" -+ test -n "$deps" && deps="$deps " -+ deps="${deps}-l${SUB_LIBRARY}" - fi +@@ -130,6 +133,8 @@ do + test $NEED_TINFO != yes ; then + test -n "$reqs" && reqs="$reqs, " + reqs="${reqs}${SUB_LIBRARY}${suffix}" ++ test -n "$deps" && deps="$deps " ++ deps="${deps}-l${SUB_LIBRARY}" fi -@@ -124,7 +129,7 @@ Description: $desc - Version: \${version} - URL: http://invisible-island.net/ncurses - Requires.private: $reqs --Libs: $LDFLAGS -l$name -+Libs: $LDFLAGS -l$name $deps - Libs.private: @LIBS@ - Cflags: $CFLAGS - EOF + echo "** creating ${name}${suffix}.pc" --- misc/ncurses-config.in -+++ misc/ncurses-config.in 2015-04-27 10:43:26.214018792 +0000 ++++ misc/ncurses-config.in 2015-04-27 10:43:26.000000000 +0000 @@ -100,7 +100,7 @@ while test $# -gt 0; do # compile/link --cflags) @@ -422,7 +413,7 @@ fi if test "${includedir}" != /usr/include ; then --- misc/terminfo.src -+++ misc/terminfo.src 2015-04-27 10:38:20.186020271 +0000 ++++ misc/terminfo.src 2015-04-27 10:38:20.000000000 +0000 @@ -301,7 +301,9 @@ dumb|80-column dumb tty, am, cols#80, @@ -434,7 +425,7 @@ gn, use=dumb, lpr|printer|line printer, OTbs, hc, os, -@@ -1629,9 +1631,15 @@ linux-c|linux console 1.3.6+ for older n +@@ -1635,9 +1637,15 @@ linux-c|linux console 1.3.6+ for older n # The 2.2.x kernels add a private mode that sets the cursor type; use that to # get a block cursor for cvvis. # reported by Frank Heckenbach . @@ -451,7 +442,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 -@@ -3014,6 +3022,7 @@ vt132|DEC vt132, +@@ -3020,6 +3028,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. @@ -459,7 +450,7 @@ # # added msgr -TD vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, -@@ -3024,7 +3033,7 @@ vt220-old|vt200-old|DEC VT220 in vt100 e +@@ -3030,7 +3039,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, @@ -468,7 +459,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, -@@ -3181,6 +3190,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. +@@ -3187,6 +3196,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul. # to SMASH the 1k-barrier... # From: Adam Thompson Sept 10 1995 # (vt320: uncommented --esr) @@ -476,7 +467,7 @@ vt320|vt300|dec vt320 7 bit terminal, am, hs, mir, msgr, xenl, cols#80, lines#24, wsl#80, -@@ -3190,7 +3200,7 @@ vt320|vt300|dec vt320 7 bit terminal, +@@ -3196,7 +3206,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, @@ -485,7 +476,7 @@ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, -@@ -3613,13 +3623,14 @@ putty-sco|putty with SCO function keys, +@@ -3619,13 +3629,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. @@ -501,7 +492,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~, -@@ -3822,6 +3833,7 @@ xterm-old|antique xterm version, +@@ -3828,6 +3839,7 @@ xterm-old|antique xterm version, use=xterm-r6, # 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. @@ -509,7 +500,7 @@ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System), OTbs, am, bce, km, mir, msgr, xenl, XT, cols#80, it#8, lines#24, ncv@, -@@ -3831,7 +3843,7 @@ xterm-xf86-v32|xterm terminal emulator ( +@@ -3837,7 +3849,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, @@ -518,7 +509,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, -@@ -4299,8 +4311,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -4305,8 +4317,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -545,7 +536,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -4635,7 +4665,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -4641,7 +4671,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -554,7 +545,7 @@ bce, kdch1=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -4799,10 +4829,14 @@ mgt|Multi GNOME Terminal, +@@ -4805,10 +4835,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). @@ -570,7 +561,7 @@ # Konsole 1.0.1 # (formerly known as kvt) # -@@ -4933,14 +4967,14 @@ mlterm3|multi lingual terminal emulator, +@@ -4939,14 +4973,14 @@ mlterm3|multi lingual terminal emulator, mlterm2|multi lingual terminal emulator, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT, colors#8, cols#80, it#8, lines#24, pairs#64, @@ -588,7 +579,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>, -@@ -4995,6 +5029,7 @@ mlterm-256color|mlterm 3.0 with xterm 25 +@@ -5001,6 +5035,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". @@ -596,7 +587,7 @@ # # removed dch/dch1 because they are inconsistent with bce/ech -TD # remove km as per tack test -TD -@@ -5006,13 +5041,14 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5012,13 +5047,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, @@ -614,7 +605,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, -@@ -5021,7 +5057,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5027,7 +5063,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, @@ -623,7 +614,7 @@ # Key Codes from rxvt reference: # # Note: Shift + F1-F10 generates F11-F20 -@@ -5104,8 +5140,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -5110,8 +5146,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, @@ -634,7 +625,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~, -@@ -5162,6 +5198,39 @@ rxvt-cygwin-native|rxvt terminal emulato +@@ -5168,6 +5204,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, @@ -674,7 +665,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, -@@ -5208,7 +5277,7 @@ mrxvt-256color|multitabbed rxvt with 256 +@@ -5214,7 +5283,7 @@ mrxvt-256color|multitabbed rxvt with 256 # Eterm 0.9.3 # # removed kf0 which conflicts with kf10 -TD @@ -683,7 +674,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 -@@ -5222,13 +5291,13 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -5228,13 +5297,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, @@ -699,7 +690,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=, -@@ -5797,7 +5866,7 @@ pty|4bsd pseudo teletype, +@@ -5803,7 +5872,7 @@ pty|4bsd pseudo teletype, #### Emacs # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 @@ -708,7 +699,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, -@@ -5810,6 +5879,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -5816,6 +5885,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, @@ -722,7 +713,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, -@@ -5910,7 +5986,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -5916,7 +5992,7 @@ screen|VT 100/ANSI X3.64 virtual termina 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@, il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, @@ -731,7 +722,7 @@ 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~, -@@ -6090,7 +6166,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -6096,7 +6172,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, @@ -740,7 +731,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, -@@ -7824,7 +7900,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -7839,7 +7915,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, @@ -749,7 +740,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, -@@ -10958,6 +11034,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -10973,6 +11049,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) @@ -757,7 +748,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, -@@ -10967,7 +11044,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -10982,7 +11059,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, @@ -766,7 +757,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, -@@ -15243,7 +15320,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -15258,7 +15335,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, @@ -775,7 +766,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, -@@ -15473,7 +15550,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -15499,7 +15576,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. diff --git a/ncurses.spec b/ncurses.spec index e2e0eb1..803e520 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,7 +1,7 @@ # # spec file for package ncurses # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -380,7 +380,8 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src # # 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 + # _nc_globals.term_driver was a NULL function pointer as + # this is for the MinGW port! # # No --enable-tcap-names because we may have to recompile # programs or foreign programs won't work @@ -434,6 +435,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src --enable-sigwinch \ --enable-colorfgbg \ --enable-sp-funcs \ + --enable-interop \ %if %abi >= 6 --with-pthread \ --enable-reentrant \ @@ -564,6 +566,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src --enable-ext-mouse \ --disable-widec \ --disable-ext-colors \ + --disable-overwrite \ %if %{with symversion} --with-versioned-syms=${PWD}/package/ncursest.map \ %endif @@ -604,6 +607,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src --enable-ext-mouse \ --enable-widec \ --enable-ext-colors \ + --disable-overwrite \ %if %{with symversion} --with-versioned-syms=${PWD}/package/ncursestw.map \ %endif @@ -650,6 +654,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src --enable-ext-mouse \ --enable-widec \ --enable-ext-colors \ + --disable-overwrite \ %if %{with symversion} --with-versioned-syms=${PWD}/package/ncursestw.map \ %endif