Dr. Werner Fink 2015-07-07 12:12:30 +00:00 committed by Git OBS Bridge
parent aeb30c4eaa
commit d7b67fae8b
7 changed files with 130 additions and 120 deletions

View File

@ -17,9 +17,9 @@
+++ configure 2013-09-30 09:17:52.000000000 +0000
@@ -6956,6 +6956,7 @@ else
fi;
echo "$as_me:6957: result: $with_overwrite" >&5
echo "$as_me:6982: result: $with_overwrite" >&5
echo "${ECHO_T}$with_overwrite" >&6
+WITH_OVERWRITE="$with_overwrite"
echo "$as_me:6960: checking if external terminfo-database is used" >&5
echo "$as_me:6985: checking if external terminfo-database is used" >&5
echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1013f5bab80b0af2d7c8c8c17499920a5614f2d3448a42635dde249eccd2c7d0
size 4916819
oid sha256:bf0fd0116c702991ee4f7f5cad540b52c70a5f0eefd799b89c868f66da7646ad
size 5003670

View File

@ -980,3 +980,18 @@
#define CANCELLED_NUMERIC (-2)
#define CANCELLED_STRING (char *)(-1)
--- progs/dump_entry.c
+++ progs/dump_entry.c 2015-07-06 14:53:52.417518527 +0000
@@ -778,8 +778,10 @@ fmt_entry(TERMTYPE *tterm,
trimmed_sgr0 = _nc_trim_sgr0(tterm);
if (strcmp(capability, trimmed_sgr0))
capability = trimmed_sgr0;
- else
- free(trimmed_sgr0);
+ else {
+ if (trimmed_sgr0 != exit_attribute_mode)
+ free(trimmed_sgr0);
+ }
set_attributes = my_sgr;
}

View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Mon Jul 6 13:37:05 UTC 2015 - werner@suse.de
- Add ncurses patch 20150606 pre-release
+ make ABI 6 the default by updates to dist.mk and VERSION, with the
intention that the existing ABI 5 should build as before using the
"--with-abi=5" option.
+ regenerate ada- and man-html documentation.
+ minor fixes to color- and util-manpages.
+ fix a regression in Ada95/gen/Makefile.in, to handle special case of
Cygwin, which uses the broken-linker feature.
+ amend fix for CF_NCURSES_CONFIG used in test/configure to assume that
ncurses package scripts work when present for cross-compiling, as the
lessor of two evils (cf: 20150530).
+ add check in configure script to disallow conflicting options
"--with-termlib" and "--enable-term-driver".
+ move defaults for "--disable-lp64" and "--with-versioned-syms" into
CF_ABI_DEFAULTS macro.
- Add ncurses patch 20150613
+ fix overflow warning for OSX with lib_baudrate.c (cf: 20010630).
+ modify script used to generate map/sym files to mark 5.9.20150530 as
the last "5.9" version, and regenerated the files. That makes the
files not use ".current" for the post-5.9 symbols. This also
corrects the label for _nc_sigprocmask used in when weak symbols are
configured for the ncursest/ncursestw libraries (prompted by
discussion with Sven Joachim).
+ fix typo in NEWS (report by Sven Joachim).
- Add ncurses patch 20150627
+ modify configure script to remove deprecated ABI 5 symbols when
building ABI 6.
+ add symbols _nc_Default_Field, _nc_Default_Form, _nc_has_mouse to
map-files, but marked as deprecated so that they can easily be
suppressed from ABI 6 builds (Debian #788610).
+ comment-out "screen.xterm" entry, and inherit screen.xterm-256color
from xterm-new (report by Richard Birkett) -TD
+ modify read_entry.c to set the error-return to -1 if no terminal
databases were found, as documented for setupterm.
+ add test_setupterm.c to demonstrate normal/error returns from the
setupterm and restartterm functions.
+ amend cleanup change from 20110813 which removed redundant definition
of ret_error, etc., from tinfo_driver.c, to account for the fact that
it should return a bool rather than int (report/analysis by Johannes
Schindelin).
- Add ncurses patch 20150704
+ fix a few problems reported by Coverity.
+ fix comparison against "/usr/include" in misc/gen-pkgconfig.in
(report by Daiki Ueno, Debian #790548, cf: 20141213).
- Add tack patch 1.07.20150606
+ Able to handle ncurses6 in configure
-------------------------------------------------------------------
Mon Jun 1 08:37:16 UTC 2015 - werner@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package ncurses
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -43,22 +43,22 @@ BuildRequires: gpm
Obsoletes: ncurses-64bit
%endif
#
Version: 5.9
Version: 6.0
Release: 0
Summary: New curses Libraries
License: MIT
Group: System/Base
#Git: http://ncurses.scripts.mit.edu
Url: http://invisible-island.net/ncurses/ncurses.html
Source0: ncurses-%{version}.tar.bz2
Source1: ncurses-%{version}-patches.tar.bz2
Source0: ncurses-5.9.tar.bz2
Source1: ncurses-5.9-patches.tar.bz2
Source2: handle.linux
Source3: README.devel
Source4: ncurses-rpmlintrc
Source5: tack-1.07-20130713.tar.bz2
Source5: tack-1.07-20150606.tar.bz2
Source6: edit.sed
Source7: baselibs.conf
Patch0: ncurses-%{version}.dif
Patch0: ncurses-5.9.dif
Patch1: ncurses-5.9-ibm327x.dif
Patch3: ncurses-5.9-overwrite.dif
Patch4: ncurses-5.7-tack.dif
@ -69,7 +69,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _miscdir %{_datadir}/misc
%global _incdir %{_includedir}
%global root %{_tmppath}/%{name}-%{version}-store
%global abi %(ver=%{version}; echo ${ver%.*})
%description
As soon as a text application needs to directly control its output to
@ -138,16 +137,13 @@ Authors:
Thomas E. Dickey <dickey@invisible-island.net>
Eric S. Raymond <esr@thyrsus.com>
%if %abi == 5
%package -n libncurses5
Summary: The New curses Libraries
License: MIT
Group: System/Libraries
Requires: terminfo-base
Provides: ncurses = %{version}
Obsoletes: ncurses < %{version}
Recommends: ncurses-utils = %{version}
Provides: ncurses = 5.9
Obsoletes: ncurses < 5.9
# bug437293
%ifarch ppc64
Obsoletes: ncurses-64bit
@ -168,18 +164,13 @@ Authors:
Juergen Pfeifer <Juergen.Pfeifer@t-online.de>
Pavel Curtis
%endif
%package -n libncurses6
Summary: The New curses Libraries
License: MIT
Group: System/Libraries
Requires: terminfo-base
%if %abi == 5
Provides: ncurses = 6.0
%else
Provides: ncurses = %{version}
%endif
Recommends: ncurses-utils = %{version}
%description -n libncurses6
The ncurses library is used by the most curses based terminal
@ -222,13 +213,8 @@ License: MIT
Group: Development/Libraries/C and C++
Provides: ncurses:%{_incdir}/ncurses.h
Requires: %{_bindir}/tack
Requires: libncurses6 = %{version}-%{release}
Requires: ncurses = %{version}-%{release}
%if %abi >= 6
Requires: libncurses6 = %{version}-%{release}
%else
Requires: libncurses5 = %{version}-%{release}
Requires: libncurses6 = %{version}-%{release}
%endif
# bug437293
%ifarch ppc64
Obsoletes: ncurses-devel-64bit
@ -271,7 +257,7 @@ Authors:
Eric S. Raymond <esr@thyrsus.com>
%prep
%setup -q -n ncurses-%{version}
%setup -q -n ncurses-5.9
rm -fr tack
rm -f Ada95/src/terminal_interface-curses.adb
rm -f Ada95/src/library.gpr
@ -448,19 +434,11 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
--enable-colorfgbg \
--enable-sp-funcs \
--enable-interop \
%if %abi >= 6
--with-pthread \
--enable-reentrant \
--enable-ext-mouse \
--disable-widec \
--enable-ext-colors \
%else
--without-pthread \
--disable-reentrant \
--disable-ext-mouse \
--disable-widec \
--disable-ext-colors \
%endif
--enable-weak-symbols \
--enable-wgetch-events \
--enable-pthreads-eintr \
@ -478,11 +456,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
--with-pc-suffix \
--enable-pc-files \
%if %{with symversion}
%if %abi >= 6
--with-versioned-syms=${PWD}/package/ncursest.map \
%else
--with-versioned-syms=${PWD}/package/ncurses.map \
%endif
%endif
%if %{with hasheddb}
--with-hashed-db \
@ -545,11 +519,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
# must not use %jobs here (would lead to: ln: ncurses.h already exists)
make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir}
ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir}
%if %abi >= 6
sh %{S:6} --cflags "-I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config
%else
sh %{S:6} --cflags "-I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses5-config
%endif
mkdir pc
mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/
#
@ -566,21 +536,22 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
popd
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 \
#
# Now use --with-pthread for reentrant pthread support (abi == 5).
#
eval screen -L -D -m ./${c#*./} --with-abi-version=5 \
--without-pthread \
--disable-reentrant \
--disable-ext-mouse \
--disable-widec \
--disable-ext-colors \
--disable-overwrite \
%if %{with symversion}
--with-versioned-syms=${PWD}/package/ncursest.map \
--with-versioned-syms=${PWD}/package/ncurses.map \
%endif
--without-progs
sleep 1
@ -589,22 +560,22 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
cp fallback.c.build ncurses/fallback.c
make -C c++ etip.h
make %{?_smp_mflags}
sed -ri "s@^(libdir=).show_libdir@\1%{_libdir}/ncurses6@;s@^(includedir=).show_includedir@\1%{_incdir}/ncurses6/ncurses@" misc/gen-pkgconfig
sed -ri "s@^(libdir=).show_libdir@\1%{_libdir}/ncurses5@;s@^(includedir=).show_includedir@\1%{_incdir}/ncurses5/ncurse5@" misc/gen-pkgconfig
# must not use %jobs here (would lead to: ln: ncurses.h already exists)
make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses6 includesubdir=/ncurses libdir=%{_libdir}/ncurses6
ln -sf %{_incdir}/ncurses6/ncurses/{curses,ncurses,term}.h %{root}%{_incdir}/ncurses6/
sh %{S:6} --cflags "-I%{_incdir}/ncurses6/ncurses -I%{_incdir}/ncurses6" --libs "-L%{_libdir}/ncurses6 -lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config
make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses5 includesubdir=/ncurses libdir=%{_libdir}/ncurses5
ln -sf %{_incdir}/ncurses5/ncurses/{curses,ncurses,term}.h %{root}%{_incdir}/ncurses5/
sh %{S:6} --cflags "-I%{_incdir}/ncurses5/ncurses -I%{_incdir}/ncurses5" --libs "-L%{_libdir}/ncurses5 -lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses5-config
pushd man
sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1
sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses5-config.1
popd
for pc in %{root}%{_libdir}/pkgconfig/*.pc
do
test -e "$pc" || break
base=${pc%%.pc}
base=${base##*/}
mv -f $pc pc/${base}6.pc
mv -f $pc pc/${base}5.pc
done
%endif
make clean
#
# Now use --enable-widec for UTF8/wide character support.
@ -613,7 +584,6 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
#
> $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 \
@ -624,15 +594,6 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
--with-versioned-syms=${PWD}/package/ncursestw.map \
%endif
--without-progs
%else
eval screen -L -D -m ./${c#*./} --disable-ext-mouse \
--enable-widec \
--disable-ext-colors \
%if %{with symversion}
--with-versioned-syms=${PWD}/package/ncursesw.map \
%endif
--without-progs
%endif
sleep 1
kill $pid
find -name fallback.o | xargs -r rm -vf
@ -641,34 +602,27 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
make %{?_smp_mflags}
# must not use %jobs here (would lead to: ln: ncurses.h already exists)
make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncursesw libdir=%{_libdir}
%if %abi >= 6
sh %{S:6} --cflags "-I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw6-config
pushd man
sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw6-config.1
popd
%else
sh %{S:6} --cflags "-I%{_incdir}/ncursesw" --libs "-lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw5-config
pushd man
sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1
popd
%endif
rm -f %{root}%{_libdir}/pkgconfig/ti*.pc
mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/
%if %abi < 6
#
# ABI == 5
#
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 \
eval screen -L -D -m ./${c#*./} --with-abi-version=5 \
--disable-reentrant \
--disable-ext-mouse \
--enable-widec \
--enable-ext-colors \
--disable-ext-colors \
--disable-overwrite \
%if %{with symversion}
--with-versioned-syms=${PWD}/package/ncursestw.map \
--with-versioned-syms=${PWD}/package/ncursesw.map \
%endif
--without-progs
sleep 1
@ -677,22 +631,19 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
cp fallback.c.build ncurses/fallback.c
make -C c++ etip.h
make %{?_smp_mflags}
sed -ri "s@^(libdir=).show_libdir@\1%{_libdir}/ncurses6@;s@^(includedir=).show_includedir@\1%{_incdir}/ncurses6/ncursesw@" misc/gen-pkgconfig
# must not use %jobs here (would lead to: ln: ncurses.h already exists)
make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses6 includesubdir=/ncursesw libdir=%{_libdir}/ncurses6
sh %{S:6} --cflags "-I%{_incdir}/ncurses6/ncursesw -I%{_incdir}/ncurses6" --libs "-L%{_libdir}/ncurses6 -lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw6-config
make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses5 includesubdir=/ncursesw libdir=%{_libdir}/ncurses5
sh %{S:6} --cflags "-I%{_incdir}/ncurses5/ncursesw -I%{_incdir}/ncurses5" --libs "-L%{_libdir}/ncurses5 -lncursesw" --libs "-ltinfo" %{root}%{_bindir}/ncursesw5-config
pushd man
sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw6-config.1
sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1
popd
rm -f %{root}%{_libdir}/pkgconfig/ti*.pc
for pc in %{root}%{_libdir}/pkgconfig/*.pc
do
test -e "$pc" || break
base=${pc%%.pc}
base=${base##*/}
mv -f $pc pc/${base}6.pc
mv -f $pc pc/${base}5.pc
done
%endif
%install
GZIP="-9"
@ -706,7 +657,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
test -e "${lib}" || continue
mv "${lib}" %{buildroot}/%{_lib}/ || continue
done
for lib in %{buildroot}/%{_lib}/${model}.so.%{abi} ; do
for lib in %{buildroot}/%{_lib}/${model}.so.6 ; do
test -e "${lib}" || continue
test -L "${lib}" || continue
lib=${lib#%{buildroot}}
@ -729,13 +680,12 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
chmod 0755 %{buildroot}/%{_lib}/lib*.so.*
chmod 0755 %{buildroot}/%{_libdir}/lib*.so.*
chmod a-x %{buildroot}/%{_libdir}/lib*.a
%if %abi < 6
if test -d %{buildroot}%{_libdir}/ncurses6 ; then
mv %{buildroot}%{_libdir}/ncurses6/*.so.6* %{buildroot}%{_libdir}/
for lib in %{buildroot}%{_libdir}/ncurses6/*.so
if test -d %{buildroot}%{_libdir}/ncurses5 ; then
mv %{buildroot}%{_libdir}/ncurses5/*.so.5* %{buildroot}%{_libdir}/
for lib in %{buildroot}%{_libdir}/ncurses5/*.so
do
lnk=$lib
lib=/%{_lib}/${lib##*/}.6
lib=/%{_lib}/${lib##*/}.5
case "${lib##*/}" in
libncurses*)
rm -f "${lnk}"
@ -757,27 +707,26 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
test -e "${lib}" || continue
mv "${lib}" %{buildroot}/%{_lib}/ || continue
done
for lib in %{buildroot}/%{_lib}/${model}.so.6 ; do
for lib in %{buildroot}/%{_lib}/${model}.so.5 ; do
test -e "${lib}" || continue
test -L "${lib}" || continue
lib=${lib#%{buildroot}}
lnk=%{buildroot}%{_libdir}/ncurses6/${model}.so
lnk=%{buildroot}%{_libdir}/ncurses5/${model}.so
case "${lib##*/}" in
libncurses*)
rm -f ${lnk}
echo '/* GNU ld script */' > ${lnk}
echo 'SEARCH_DIR(%{_libdir}/ncurses6)' >> ${lnk}
echo 'SEARCH_DIR(%{_libdir}/ncurses5)' >> ${lnk}
echo "INPUT(${lib} AS_NEEDED(-ltinfo))" >> ${lnk}
;;
*) ln -sf ${lib} %{buildroot}%{_libdir}/ncurses6/${model}.so
*) ln -sf ${lib} %{buildroot}%{_libdir}/ncurses5/${model}.so
esac
done
done
chmod 0755 %{buildroot}/%{_lib}/lib*.so.6*
chmod 0755 %{buildroot}/%{_libdir}/lib*.so.6*
chmod a-x %{buildroot}/%{_libdir}/ncurses6/lib*.a
chmod 0755 %{buildroot}/%{_lib}/lib*.so.5*
chmod 0755 %{buildroot}/%{_libdir}/lib*.so.5*
chmod a-x %{buildroot}/%{_libdir}/ncurses5/lib*.a
fi
%endif
test -n "%{buildroot}" || ldconfig -N
mkdir -p %{buildroot}%{_defaultdocdir}/ncurses
bzip2 -c misc/terminfo.src > misc/terminfo.src.bz2
@ -872,12 +821,10 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
> extension.list
rm -f %{buildroot}%{_prefix}/lib/terminfo
mv pc/*.pc %{buildroot}%{_libdir}/pkgconfig/
%if %abi < 6
%post -n libncurses5 -p /sbin/ldconfig
%postun -n libncurses5 -p /sbin/ldconfig
%endif
%post -n libncurses6 -p /sbin/ldconfig
@ -906,13 +853,11 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
%doc %{_mandir}/man1/tput.1.gz
%doc %{_mandir}/man1/tset.1.gz
%doc %{_mandir}/man5/*.gz
%if %abi == 5
%files -n libncurses5
%defattr(-,root,root)
/%{_lib}/lib*.so.5*
%{_libdir}/lib*.so.5*
%endif
%files -n libncurses6
%defattr(-,root,root)
@ -930,17 +875,17 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
%{_bindir}/tic
%dir %{_incdir}/ncurses/
%dir %{_incdir}/ncursesw/
%dir %{_incdir}/ncurses6/
%dir %{_incdir}/ncurses6/ncurses/
%dir %{_incdir}/ncurses6/ncursesw/
%dir %{_incdir}/ncurses5/
%dir %{_incdir}/ncurses5/ncurses/
%dir %{_incdir}/ncurses5/ncursesw/
%{_incdir}/*.h
%{_incdir}/ncurses*/*.h
%{_incdir}/ncurses*/*/*.h
%dir %{_libdir}/ncurses6/
%{_libdir}/lib*.a
%{_libdir}/lib*.so
%{_libdir}/ncurses6/lib*.a
%{_libdir}/ncurses6/lib*.so
%dir %{_libdir}/ncurses5/
%{_libdir}/ncurses5/lib*.a
%{_libdir}/ncurses5/lib*.so
%{_libdir}/pkgconfig/*.pc
%doc %{_mandir}/man1/*-config.1.gz
%doc %{_mandir}/man1/captoinfo.1.gz

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a64a318cf72e01ed1cbacdbb94e8db9f607f45c2382237e5247a499ea3021431
size 155586

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cffefd505dec486f4e9e9086f22042bc7b4abd169dfbfb27b54a91e15300e39f
size 158694