diff --git a/README.devel b/README.devel index 699d8d3..26c9093 100644 --- a/README.devel +++ b/README.devel @@ -3,7 +3,7 @@ There are several Ncurses Libraries which can be used for building with an terminal based application. The standard Ncurses Libraries -is given with ABI 5.6 +is given with ABI 5.9 /usr/include/ncurses/*.h /usr/lib/libncurses.so or /usr/lib64/libncurses.so @@ -21,7 +21,7 @@ will be also found in /usr/include/. Use the output of to extend the CFLAGS and the LDFLAGS. For a version with wide character support please use the -libraries with old ABI 5.6 +libraries with old ABI 5.9 /usr/include/ncursesw/*.h /usr/lib/libncursesw.so or /usr/lib64/libncursesw.so diff --git a/handle.linux b/handle.linux index dbca158..6a7db13 100644 --- a/handle.linux +++ b/handle.linux @@ -7,6 +7,8 @@ trap "rm -f $tmp1 $tmp2; exit" EXIT SIGPIPE SIGTERM SIGINT : ${TERMCAP:=/etc/termcap} : ${TERMINFO:=/usr/share/terminfo} +: ${BUILD_TIC:=/usr/bin/tic} +: ${BUILD_INFOCMP:=/usr/bin/infocmp} acsc= sgr= mpch= @@ -15,11 +17,11 @@ ed= declare -i line=0 if test -r run_cmd.sh ; then - function tc { sh run_cmd.sh tic -U -C -r ${1+"$@"}; } - function ic { sh run_cmd.sh infocmp -A $TERMINFO ${1+"$@"}; } + function tc { sh run_cmd.sh $BUILD_TIC -U -C -r ${1+"$@"}; } + function ic { sh run_cmd.sh $BUILD_INFOCMP -A $TERMINFO ${1+"$@"}; } else - function tc { tic -U -C -r ${1+"$@"}; } - function ic { infocmp -A $TERMINFO ${1+"$@"}; } + function tc { $BUILD_TIC -U -C -r ${1+"$@"}; } + function ic { $BUILD_INFOCMP -A $TERMINFO ${1+"$@"}; } fi cp $TERMCAP ${TERMCAP##*/}.new diff --git a/ncurses-5.9-overwrite.dif b/ncurses-5.9-overwrite.dif index 2191dbd..1729e27 100644 --- a/ncurses-5.9-overwrite.dif +++ b/ncurses-5.9-overwrite.dif @@ -1,6 +1,6 @@ --- configure.in -+++ configure.in 2012-01-30 16:31:47.000000000 +0000 -@@ -415,6 +415,7 @@ AC_ARG_ENABLE(overwrite, ++++ configure.in 2012-01-30 17:31:47.000000000 +0100 +@@ -426,6 +426,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 2012-01-30 16:42:40.000000000 +0000 -@@ -6065,6 +6065,7 @@ else ++++ configure 2012-01-30 17:42:40.000000000 +0100 +@@ -6083,6 +6083,7 @@ else fi; - echo "$as_me:6066: result: $with_overwrite" >&5 + echo "$as_me:6084: result: $with_overwrite" >&5 echo "${ECHO_T}$with_overwrite" >&6 +WITH_OVERWRITE="$with_overwrite" - echo "$as_me:6069: checking if external terminfo-database is used" >&5 + echo "$as_me:6087: 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 20ab3a6..a092a67 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:aaabcb5245a5bdc6b50e0aa6048bb3a0dea2c26c1186f43f646e35590e72a177 -size 1930646 +oid sha256:694f92d644a01154b7c88853638d5253c409325329d0ec63fe63206c61d3324e +size 2059490 diff --git a/ncurses.changes b/ncurses.changes index 9f42173..bbc35e7 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Tue Mar 26 12:33:13 UTC 2013 - werner@suse.de + +- Add ncurses patch 20130324 + + build-fix for libtool configuration (reports by Daniel Silva Ferreira + and Roumen Petrov). +- Add ncurses patch 20130323 + + build-fix for OS X, to handle changes for --with-cxx-shared feature + (report by Christian Ebert). + + change initialization for vt220, similar entries for consistency + with cursor-key strings (NetBSD #47674) -TD + + further improvements to linux-16color (Benjamin Sittler) +- Add ncurses patch 20130316 + + additional fix for tic.c, to allocate missing buffer space. + + eliminate configure-script warnings for gen-pkgconfig.in + + correct typo in sgr string for sun-color, + add bold for consistency with sgr, + change smso for consistency with sgr -TD + + correct typo in sgr string for terminator -TD + + add blink to the attributes masked by ncv in linux-16color (report + by Benjamin Sittler) + + improve warning message from post-load checking for missing "%?" + operator by tic/infocmp by showing the entry name and capability. + + minor formatting improvement to tic/infocmp -f option to ensure + line split after "%;". + + amend scripting for --with-cxx-shared option to handle the debug + library "libncurses++_g.a" (report by Sven Joachim). +- Add ncurses patch 20130309 + + amend change to toe.c for reading from /dev/zero, to ensure that + there is a buffer for the temporary filename (cf: 20120324). + + regenerated html manpages. + + fix typo in terminfo.head (report by Sven Joachim, cf: 20130302). + + updated some autoconf macros: + + CF_ACVERSION_CHECK, from byacc 1.9 20130304 + + CF_INTEL_COMPILER, CF_XOPEN_SOURCE from luit 2.0-20130217 + + add configure option --with-cxx-shared to permit building + libncurses++ as a shared library when using g++, e.g., the same + limitations as libtool but better integrated with the usual build + configuration (Redhat 911540). + + modify MKkey_defs.sh to filter out build-path which was unnecessarily + shown in curses.h (Debian #689131). +- Add ncurses patch 20130302 + + add section to terminfo manpage discussing user-defined capabilities. + + update manpage description of NCURSES_NO_SETBUF, explaining why it + is obsolete. + + add a check in waddch_nosync() to ensure that tab characters are + treated as control characters; some broken locales claim they are + printable. + + add some traces to the Windows console driver. + + initialize a temporary array in _nc_mbtowc, needed for some cases + of raw input in MinGW port. +- Make it build even with shared libncurses++ and its demo test program + ------------------------------------------------------------------- Mon Feb 18 12:50:14 UTC 2013 - werner@suse.de diff --git a/ncurses.spec b/ncurses.spec index a09a855..1d773e3 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -280,14 +280,14 @@ rm -vf mk-dlls.sh SCREENRC=${SCREENDIR}/ncurses export SCREENRC SCREENDIR exec 0< /dev/null - SCREENLOG=${SCREENDIR}/config.screen + SCREENLOG=${SCREENDIR}/log cat > $SCREENRC<<-EOF deflogin off logfile $SCREENLOG logfile flush 1 logtstamp off log on - setsid off + setsid on scrollback 0 silence on utf8 on @@ -375,6 +375,7 @@ rm -vf mk-dlls.sh # touch --reference=README config.sub config.guess > $SCREENLOG + tail -q -s 0.5 -f $SCREENLOG & pid=$! %configure \ --without-ada \ --without-debug \ @@ -433,8 +434,9 @@ rm -vf mk-dlls.sh "${WITHCHTYPE}" \ --disable-widec \ --disable-tic-depends \ + --with-cxx-shared \ --with-ticlib=tic - cat $SCREENLOG + kill $pid # # The configure line # @@ -454,17 +456,24 @@ rm -vf mk-dlls.sh TERMINFO=$PWD/tmp export TERMINFO mkdir -p $TERMINFO + cp -p $PWD/../progs/tic $PWD/../progs/tic.build + cp -p $PWD/../progs/infocmp $PWD/../progs/infocmp.build + (cat > ${PWD}/.build_tic)<<-EOF %if 0%{?_crossbuild} -export BUILD_TIC=/usr/bin/tic + export BUILD_TIC=/usr/bin/tic + export BUILD_INFOCMP=/usr/bin/infocmp %else -export BUILD_TIC=$PWD/../progs/tic + export BUILD_TIC=$PWD/../progs/tic.build + export BUILD_INFOCMP=$PWD/../progs/infocmp.build %endif + EOF + . ${PWD}/.build_tic $BUILD_TIC -I -r -e $FALLBK ../misc/terminfo.src > terminfo.src $BUILD_TIC -o $TERMINFO -s terminfo.src sh -e ./tinfo/MKfallback.sh $TERMINFO ../misc/terminfo.src $BUILD_TIC ${FALLBK//,/ } > fallback.c rm -rf $TERMINFO unset TERMINFO - cp -p fallback.c ../fallback.c.backup + cp -p fallback.c ../fallback.c.build popd PATH=$OPATH unset LD_LIBRARY_PATH @@ -477,7 +486,8 @@ export BUILD_TIC=$PWD/../progs/tic # Now rebuild libncurses and do the rest of this job # find -name fallback.o | xargs -r rm -vf - cp fallback.c.backup ncurses/fallback.c + cp fallback.c.build ncurses/fallback.c + make -C c++ etip.h make %{?_smp_mflags} lib=%{_libdir} inc=%{_incdir}/ncurses @@ -500,14 +510,17 @@ export BUILD_TIC=$PWD/../progs/tic unset LD_LIBRARY_PATH test ! -L tack || rm -f tack %if %abi < 6 + make clean # # Now use --with-pthread for reentrant pthread support (abi > 5). # > $SCREENLOG + tail -q -s 0.5 -f $SCREENLOG & pid=$! eval screen -L -D -m ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --disable-widec --disable-ext-colors --without-progs - cat $SCREENLOG + kill $pid find -name fallback.o | xargs -r rm -vf - cp fallback.c.backup ncurses/fallback.c + cp fallback.c.build ncurses/fallback.c + make -C c++ etip.h make %{?_smp_mflags} lib=%{_libdir}/ncurses6 inc=%{_incdir}/ncurses6/ncurses @@ -519,20 +532,23 @@ export BUILD_TIC=$PWD/../progs/tic sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1 popd %endif + make clean # # Now use --enable-widec for UTF8/wide character support. # The libs with 16 bit wide characters are binary incompatible # to the normal 8bit wide character libs. # > $SCREENLOG + tail -q -s 0.5 -f $SCREENLOG & pid=$! %if %abi >= 6 eval screen -L -D -m ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --enable-widec --enable-ext-colors --without-progs %else eval screen -L -D -m ./${c#*./} --disable-ext-mouse --enable-widec --disable-ext-colors --without-progs %endif - cat $SCREENLOG + kill $pid find -name fallback.o | xargs -r rm -vf - cp fallback.c.backup ncurses/fallback.c + cp fallback.c.build ncurses/fallback.c + make -C c++ etip.h make %{?_smp_mflags} lib=%{_libdir} inc=%{_incdir}/ncursesw @@ -543,14 +559,17 @@ export BUILD_TIC=$PWD/../progs/tic sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1 popd %if %abi < 6 + make clean # # Do both --enable-widec and --with-pthread (abi > 5). # > $SCREENLOG + tail -q -s 0.5 -f $SCREENLOG & pid=$! eval screen -L -D -m ./${c#*./} --with-pthread --enable-reentrant --enable-ext-mouse --enable-widec --enable-ext-colors --without-progs - cat $SCREENLOG + kill $pid find -name fallback.o | xargs -r rm -vf - cp fallback.c.backup ncurses/fallback.c + cp fallback.c.build ncurses/fallback.c + make -C c++ etip.h make %{?_smp_mflags} lib=%{_libdir}/ncurses6 inc=%{_incdir}/ncurses6/ncursesw @@ -660,15 +679,11 @@ export BUILD_TIC=$PWD/../progs/tic install -m 644 NEWS %{buildroot}%{_defaultdocdir}/ncurses/ mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_miscdir} - LD_LIBRARY_PATH=$PWD/lib + LD_LIBRARY_PATH=%{buildroot}%{_libdir} export LD_LIBRARY_PATH pushd ncurses/ + . ${PWD}/.build_tic { echo "# See annotated version in %{_defaultdocdir}/ncurses/terminfo.src.bz2" -%if 0%{?_crossbuild} - BUILD_TIC=/usr/bin/tic -%else - BUILD_TIC=$PWD/../progs/tic -%endif $BUILD_TIC -C -r ../misc/terminfo.src | grep -E -v '^#'; } > termcap # Gererate new termcap entries for various linux consoles TERMCAP=termcap \