From 7b285cdc8b1809c985bbe8b8ded5e144880b56dffb14cadfb1d301875630d19d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 16 Dec 2014 11:21:56 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=179 --- ncurses-5.9-overwrite.dif | 4 +- ncurses-5.9-patches.tar.bz2 | 4 +- ncurses-5.9.dif | 82 ++++++++++++++++++------------------- ncurses.changes | 34 +++++++++++++++ ncurses.spec | 1 + 5 files changed, 80 insertions(+), 45 deletions(-) diff --git a/ncurses-5.9-overwrite.dif b/ncurses-5.9-overwrite.dif index a81ce9d..74465b4 100644 --- a/ncurses-5.9-overwrite.dif +++ b/ncurses-5.9-overwrite.dif @@ -17,9 +17,9 @@ +++ configure 2013-09-30 09:17:52.000000000 +0000 @@ -6526,6 +6526,7 @@ else fi; - echo "$as_me:6733: result: $with_overwrite" >&5 + echo "$as_me:6797: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 +WITH_OVERWRITE="$with_overwrite" - echo "$as_me:6736: checking if external terminfo-database is used" >&5 + echo "$as_me:6800: 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 c800676..1b87813 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:b74054c244a34d6453d17f8ad0e4954d5b4c625dc022d81414e2160542cb75ae -size 4015619 +oid sha256:0ab879122039f7b1528ddf86d38f435134146022e85633c99c2e8ab39cf9c83a +size 4152720 diff --git a/ncurses-5.9.dif b/ncurses-5.9.dif index 157eb29..a21093f 100644 --- a/ncurses-5.9.dif +++ b/ncurses-5.9.dif @@ -32,7 +32,7 @@ #include #if defined(__cplusplus) -@@ -4405,12 +4405,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 -@@ -4535,9 +4538,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 -@@ -11067,9 +11070,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man </dev/null ; then - reqs="$PANEL_LIBRARY, $MENU_LIBRARY, $FORM_LIBRARY, $MAIN_LIBRARY" + reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}" + deps="-l$PANEL_LIBRARY -l$MENU_LIBRARY -l$FORM_LIBRARY -l$MAIN_LIBRARY" desc="$desc add-on library" else - reqs="$MAIN_LIBRARY" + reqs="$MAIN_LIBRARY${suffix}" + deps="-l$MAIN_LIBRARY" desc="$desc add-on library" fi -@@ -98,6 +101,8 @@ do +@@ -106,6 +109,8 @@ do if test $name != $TINFO_NAME ; then test -n "$reqs" && reqs="$reqs, " - reqs="${reqs}${SUB_LIBRARY}" + reqs="${reqs}${SUB_LIBRARY}${suffix}" + test -n "$deps" && deps="$deps " + deps="${deps}-l${SUB_LIBRARY}" fi fi -@@ -115,7 +120,7 @@ Description: $desc +@@ -123,7 +128,7 @@ Description: $desc Version: \${version} URL: http://invisible-island.net/ncurses Requires.private: $reqs @@ -699,7 +699,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=, -@@ -5785,7 +5854,7 @@ pty|4bsd pseudo teletype, +@@ -5790,7 +5859,7 @@ pty|4bsd pseudo teletype, #### Emacs # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 @@ -708,7 +708,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=^M, -@@ -5798,6 +5867,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -5803,6 +5872,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 +722,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, -@@ -5897,7 +5973,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -5902,7 +5978,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@, @@ -731,7 +731,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, -@@ -6078,7 +6154,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -6083,7 +6159,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 +740,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, -@@ -7812,7 +7888,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -7817,7 +7893,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 +749,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, -@@ -10946,6 +11022,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -10951,6 +11027,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 +757,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, -@@ -10955,7 +11032,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -10960,7 +11037,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 +766,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, -@@ -15231,7 +15308,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -15236,7 +15313,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 +775,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, -@@ -15461,7 +15538,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -15466,7 +15543,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. @@ -786,7 +786,7 @@ ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, --- ncurses/Makefile.in +++ ncurses/Makefile.in 2011-02-28 13:39:31.000000000 +0000 -@@ -211,7 +211,7 @@ $(DESTDIR)$(libdir) : +@@ -215,7 +215,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ ./fallback.c : $(tinfo)/MKfallback.sh @@ -796,8 +796,8 @@ ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ --- ncurses/curses.priv.h -+++ ncurses/curses.priv.h 2014-10-13 12:22:30.203838763 +0000 -@@ -2015,6 +2015,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec ++++ ncurses/curses.priv.h 2014-10-13 12:22:30.000000000 +0000 +@@ -2016,6 +2016,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); extern NCURSES_EXPORT(int) _nc_access (const char *, int); diff --git a/ncurses.changes b/ncurses.changes index 169a533..6886b49 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Tue Dec 16 11:14:35 UTC 2014 - werner@suse.de + +- Add ncurses patch 20141206 + + updated ".map" files so that each symbol that may be shared across + the different library configurations has the same label. Some + review is needed to ensure these are really compatible. + + modify MKlib_gen.sh to work around change in development version of + gcc introduced here: + https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html + https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html + (reports by Marcus Shawcroft, Maohui Lei). + + improved configure macro CF_SUBDIR_PATH, from lynx changes. +- Add ncurses patch 20141213 + + modify misc/gen-pkgconfig.in to add -I option for include-directory + when using both --prefix and --disable-overwrite (report by Misty + De Meo). + + add configure option --with-pc-suffix to allow minor renaming of + ".pc" files and the corresponding library. Use this in the test + package for ncurses6. + + modify configure script so that if pkg-config is not installed, it + is still possible to install ".pc" files (report by Misty De Meo). + + updated ".sym" files, removing symbols which are marked as "local" + in the corresponding ".map" files. + + updated ".map" files to reflect move of comp_captab and comp_hash + from tic-library to tinfo-library in 20090711 (report by Sven + Joachim). +- Add ncurses patch 20141129 + + improved ".map" files by generating them with a script that builds + ncurses with several related configurations and merges the results. + A further refinement is planned, to make the tic- and tinfo-library + symbols use the same versions across each of the four configurations + which are represented (reports by Sven Joachim, Werner Fink). + ------------------------------------------------------------------- Mon Nov 17 13:13:16 UTC 2014 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index cf290be..a53dfb8 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -454,6 +454,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src --disable-tic-depends \ --with-cxx-shared \ --with-ticlib=tic \ + --with-pc-suffix \ --enable-pc-files \ --with-pkg-config-libdir=%{_libdir}/pkgconfig kill $pid