forked from pool/ncurses
Update to ncurses 6.1-20190209
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=409
This commit is contained in:
Dr. Werner Fink
Git OBS Bridge
parent
4977a451ed
commit
fbd20f1e7e
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f1a51e5b75b221b3cea5e19cd8388fb8e74c2bedf1dbaffbd643b392908043d9
|
||||
size 1282692
|
||||
oid sha256:07a4a4b7ef4373d244ebcb1a70273cc62120c6aeebb62d269991a0ccbc552445
|
||||
size 1285004
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
man/man_db.renames | 2
|
||||
man/ncurses.3x | 4 +
|
||||
misc/gen-pkgconfig.in | 7 +-
|
||||
misc/ncurses-config.in | 2
|
||||
misc/terminfo.src | 138 ++++++++++++++++++++++++++++++++++---------
|
||||
ncurses/Makefile.in | 2
|
||||
ncurses/curses.priv.h | 2
|
||||
@ -19,7 +18,7 @@
|
||||
ncurses/tinfo/read_termcap.c | 21 ++++--
|
||||
progs/Makefile.in | 4 -
|
||||
test/test.priv.h | 4 -
|
||||
20 files changed, 249 insertions(+), 81 deletions(-)
|
||||
19 files changed, 248 insertions(+), 80 deletions(-)
|
||||
|
||||
--- aclocal.m4
|
||||
+++ aclocal.m4 2019-02-06 07:51:48.441355403 +0000
|
||||
@ -398,17 +397,6 @@
|
||||
fi
|
||||
|
||||
if test $name = $MAIN_LIBRARY
|
||||
--- misc/ncurses-config.in
|
||||
+++ misc/ncurses-config.in 2019-02-06 07:51:48.445355328 +0000
|
||||
@@ -100,7 +100,7 @@ while test $# -gt 0; do
|
||||
# compile/link
|
||||
--cflags)
|
||||
INCS="@PKG_CFLAGS@"
|
||||
- if test "x@WITH_OVERWRITE@" = xno ; then
|
||||
+ if test "${THIS%[0-5]*}" = xno ; then
|
||||
INCS="$INCS -I${includesubdir}"
|
||||
fi
|
||||
if test "${includedir}" != /usr/include ; then
|
||||
--- misc/terminfo.src
|
||||
+++ misc/terminfo.src 2019-02-06 07:51:48.453355178 +0000
|
||||
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
|
||||
|
||||
@ -1,43 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 11 09:46:34 UTC 2019 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Fix configure scripts as well as pkg-config configurations
|
||||
that is correct paths in pkg-config and use pkg-config to
|
||||
configure the configure scripts as well
|
||||
- Add ncurses patch 20190209
|
||||
+ add check in tic to provide warnings for mismatched number of
|
||||
parameters in the documented user-capability extensions.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 6 07:45:22 UTC 2019 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
-Add ncurses patch 20190202
|
||||
+ modify rpm test-package ".spec" file to work around naming conflict
|
||||
with Redhat's package for ncurses6.
|
||||
+ modify no-leaks code in test/picsmap to avoid non-standard tdestroy.
|
||||
+ amend change to configure script which altered the top-level makefile
|
||||
to avoid attempting to install the terminfo database when it was not
|
||||
configured, to allow for installing the ".pc" files which are also
|
||||
in the misc directory (report by Steve Wills).
|
||||
-Add ncurses patch 20190126
|
||||
+ change some "%define" statements in test-packages for RPMs to
|
||||
"%global" to work around changes in rpm 4.14 from recent Redhat.
|
||||
+ fixes for O_INPUT_FIELD extension (patch by Leon Winter).
|
||||
+ eliminate fixed buffer-size when reading $TERMCAP variable.
|
||||
+ correct logic in read_entry.c which prevented $TERMCAP variable from
|
||||
being interpreted as a fallback to terminfo entry (prompted by
|
||||
Savannah #54556, cf: 20110924).
|
||||
-Add ncurses patch 20190121
|
||||
+ add a check in test/configure to work around non-ncurses termcap.h
|
||||
file in Slackware.
|
||||
+ corrected flag for "seq" method of db 1.8.5 interface, needed by toe
|
||||
on some of the BSDs.
|
||||
+ updated "string-hacks" feature.
|
||||
+ minor improvements to manpage typography.
|
||||
+ corrected conditionally-compiled limit on color pairs (report by
|
||||
"Hudd").
|
||||
+ add -x option to test/pair_content, test/color_content for testing
|
||||
init_extended_pair, extended_pair_content, init_extended_color,
|
||||
extended_color_content
|
||||
+ add -p option to test/pair_content, test/color_content to show the
|
||||
return values from the tested functions.
|
||||
+ improve manual page curs_color.3x discussion of error returns and
|
||||
extensions.
|
||||
+ add O_INPUT_FIELD extension to form library (patch by Leon Winter).
|
||||
+ override/suppress --enable-db-install if --disable-database configure
|
||||
option was given.
|
||||
+ change a too-large terminal entry in tic from a fatal error to a
|
||||
warning (prompted by discussion with Gabriele Balducci).
|
||||
- Add ncurses patch 20190202
|
||||
+ modify rpm test-package ".spec" file to work around naming conflict
|
||||
with Redhat's package for ncurses6.
|
||||
+ modify no-leaks code in test/picsmap to avoid non-standard tdestroy.
|
||||
+ amend change to configure script which altered the top-level makefile
|
||||
to avoid attempting to install the terminfo database when it was not
|
||||
configured, to allow for installing the ".pc" files which are also
|
||||
in the misc directory (report by Steve Wills).
|
||||
- Add ncurses patch 20190126
|
||||
+ change some "%define" statements in test-packages for RPMs to
|
||||
"%global" to work around changes in rpm 4.14 from recent Redhat.
|
||||
+ fixes for O_INPUT_FIELD extension (patch by Leon Winter).
|
||||
+ eliminate fixed buffer-size when reading $TERMCAP variable.
|
||||
+ correct logic in read_entry.c which prevented $TERMCAP variable from
|
||||
being interpreted as a fallback to terminfo entry (prompted by
|
||||
Savannah #54556, cf: 20110924).
|
||||
- Add ncurses patch 20190121
|
||||
+ add a check in test/configure to work around non-ncurses termcap.h
|
||||
file in Slackware.
|
||||
+ corrected flag for "seq" method of db 1.8.5 interface, needed by toe
|
||||
on some of the BSDs.
|
||||
+ updated "string-hacks" feature.
|
||||
+ minor improvements to manpage typography.
|
||||
+ corrected conditionally-compiled limit on color pairs (report by
|
||||
"Hudd").
|
||||
+ add -x option to test/pair_content, test/color_content for testing
|
||||
init_extended_pair, extended_pair_content, init_extended_color,
|
||||
extended_color_content
|
||||
+ add -p option to test/pair_content, test/color_content to show the
|
||||
return values from the tested functions.
|
||||
+ improve manual page curs_color.3x discussion of error returns and
|
||||
extensions.
|
||||
+ add O_INPUT_FIELD extension to form library (patch by Leon Winter).
|
||||
+ override/suppress --enable-db-install if --disable-database configure
|
||||
option was given.
|
||||
+ change a too-large terminal entry in tic from a fatal error to a
|
||||
warning (prompted by discussion with Gabriele Balducci).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 14 07:24:52 UTC 2019 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
30
ncurses.spec
30
ncurses.spec
@ -547,10 +547,12 @@ mv tack-* tack
|
||||
cp -p %{root}%{_libdir}/libtinfow.so.%{version} libtinfow.so.%{version}.back
|
||||
%endif
|
||||
ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir}
|
||||
sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncursesw" --libs "-lncursesw" \
|
||||
--libs "-l%{soname_tinfo}" %{root}%{_bindir}/ncursesw6-config
|
||||
mkdir pc
|
||||
PKG_CONFIG_PATH=$PWD/pc:$(pkg-config --variable pc_path pkg-config)
|
||||
export PKG_CONFIG_PATH
|
||||
mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/
|
||||
sh %{S:6} --cflags "$(pkg-config --cflags ncursesw)" --libs "$(pkg-config --libs ncursesw)" \
|
||||
%{root}%{_bindir}/ncursesw6-config
|
||||
#
|
||||
# Some tests
|
||||
#
|
||||
@ -623,8 +625,6 @@ mv tack-* tack
|
||||
# must not use %jobs here (would lead to: ln: ncurses.h already exists)
|
||||
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 "-D_GNU_SOURCE -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} . ncurses5-config.1
|
||||
popd
|
||||
@ -637,8 +637,13 @@ mv tack-* tack
|
||||
tic) sed -ri 's@^(Requires.private: ).*@\1tinfo5@' "$pc" ;;
|
||||
*) sed -ri 's@^(Requires.private: ).*@\1ncurses5@' "$pc"
|
||||
esac
|
||||
sed -ri 's@^(includedir=).*@\1%{_incdir}/ncurses5/ncurses@' "$pc"
|
||||
sed -ri 's@^(libdir=).*@\1%{_libdir}/ncurses5@' "$pc"
|
||||
sed -ri 's@^(Libs: )(.*)@\1-L${libdir}\2@' "$pc"
|
||||
mv -f $pc pc/${base}5.pc
|
||||
done
|
||||
sh %{S:6} --cflags "$(pkg-config --cflags ncurses5)" --libs "$(pkg-config --libs ncurses5)" \
|
||||
%{root}%{_bindir}/ncurses5-config
|
||||
|
||||
#
|
||||
# Now use --disable-widec for narrow character support.
|
||||
@ -682,12 +687,12 @@ mv tack-* tack
|
||||
cp -p libtinfo.so.%{version}.back %{root}%{_libdir}/libtinfo.so.%{version}
|
||||
cp -p libtinfow.so.%{version}.back %{root}%{_libdir}/libtinfow.so.%{version}
|
||||
%endif
|
||||
sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses" --libs "-lncurses" \
|
||||
--libs "-ltinfo" %{root}%{_bindir}/ncurses6-config
|
||||
pushd man
|
||||
sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1
|
||||
popd
|
||||
mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/
|
||||
sh %{S:6} --cflags "$(pkg-config --cflags ncurses)" --libs "$(pkg-config --libs ncurses)" \
|
||||
%{root}%{_bindir}/ncurses6-config
|
||||
#
|
||||
# Some tests
|
||||
#
|
||||
@ -754,8 +759,6 @@ mv tack-* tack
|
||||
gcc $CFLAGS $LDFLAGS -fPIC -shared -Wl,--auxiliary=libtinfo.so.5,-soname,libtinfow.so.5,-stats,-lc \
|
||||
-Wl,--version-script,package/ncursesw.map -o %{root}%{_libdir}/libtinfow.so.5.9
|
||||
%endif
|
||||
sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses5/ncursesw -I%{_incdir}/ncurses5" --libs "-L%{_libdir}/ncurses5 -lncursesw" \
|
||||
--libs "-l%{soname_tinfo}" %{root}%{_bindir}/ncursesw5-config
|
||||
pushd man
|
||||
sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1
|
||||
popd
|
||||
@ -765,15 +768,16 @@ mv tack-* tack
|
||||
base=${pc%%.pc}
|
||||
base=${base##*/}
|
||||
case "$base" in
|
||||
tinfo) sed -ri 's@(includedir=/usr/include/ncurses5/ncurses)w.*@\1@' "$pc" ;;
|
||||
tic) sed -ri 's@(includedir=/usr/include/ncurses5/ncurses)w.*@\1@' "$pc" ;;
|
||||
esac
|
||||
case "$base" in
|
||||
tic) sed -ri 's@^(Requires.private: ).*@\1tinfo5@' "$pc" ;;
|
||||
*) sed -ri 's@^(Requires.private: ).*@\1ncurses5@' "$pc"
|
||||
esac
|
||||
sed -ri 's@^(includedir=).*@\1%{_incdir}/ncurses5/ncursesw@' "$pc"
|
||||
sed -ri 's@^(libdir=).*@\1%{_libdir}/ncurses5@' "$pc"
|
||||
sed -ri 's@^(Libs: )(.*)@\1-L${libdir}\2@' "$pc"
|
||||
mv -f $pc pc/${base}5.pc
|
||||
done
|
||||
sh %{S:6} --cflags "$(pkg-config --cflags ncursesw5)" --libs "$(pkg-config --libs ncursesw5)" \
|
||||
%{root}%{_bindir}/ncursesw5-config
|
||||
|
||||
%install
|
||||
PATH=$PWD/gzip:$PATH
|
||||
@ -981,7 +985,7 @@ mv tack-* tack
|
||||
grep -v -F -x -f default.list -f screen.list -f iterm.list \
|
||||
> extension.list
|
||||
rm -f %{buildroot}%{_prefix}/lib/terminfo
|
||||
mv pc/*.pc %{buildroot}%{_libdir}/pkgconfig/
|
||||
cp -p pc/*.pc %{buildroot}%{_libdir}/pkgconfig/
|
||||
|
||||
%if 0%{?qemu_user_space_build:1}%{?_crossbuild}
|
||||
# No test here
|
||||
|
||||
Loading…
Reference in New Issue
Block a user