Accepting request 945994 from Base:System

- Add ncurses patch 20220101
  + add section on releasing memory to curs_termcap.3x and
    curs_terminfo.3x manpages.
- Add ncurses patch 20211225
  + improve markup, e.g., for external manpage links in the manpages
    (prompted by report by Helge Kreutzmann).
- Add ncurses patch 20211219
  + install ncurses-examples programs in libexecdir, adding a wrapper
    script to invoke those.
  + add help-screen and screen-dump to test/combine.c
- Rename package ncurses-tests to ncurses-examples as upstream does

- Add ncurses patch 20211211
  + add test/combine.c, to demo/test combining characters.

- Add ncurses patch 20211204
  + improve configure check for getttynam (report by Werner Fink).
- Correct offsets of patch ncurses-6.3.dif

OBS-URL: https://build.opensuse.org/request/show/945994
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=203
This commit is contained in:
Dominique Leuenberger 2022-01-15 19:05:04 +00:00 committed by Git OBS Bridge
commit 155ff88110
4 changed files with 54 additions and 36 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:dd51269ae94fee72e4e0fad9374e9eede33eba91327ec8e4fdd0ec38bb36a846 oid sha256:35b3834decf8729922ab068e11a192f83e800282afbb14926135237aeed340f7
size 286361 size 481847

View File

@ -28,7 +28,7 @@
#include <stdio.h> #include <stdio.h>
#if defined(__cplusplus) #if defined(__cplusplus)
@@ -5835,12 +5835,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -5890,12 +5890,15 @@ cat >>$cf_edit_man <<CF_EOF
echo "? missing rename for \$cf_source" echo "? missing rename for \$cf_source"
cf_target="\$cf_source" cf_target="\$cf_source"
fi fi
@ -46,7 +46,7 @@
sed -f "$cf_man_alias" \\ sed -f "$cf_man_alias" \\
CF_EOF CF_EOF
@@ -5850,7 +5853,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -5905,7 +5908,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF CF_EOF
else else
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -55,7 +55,7 @@
CF_EOF CF_EOF
fi fi
@@ -5890,7 +5893,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -5945,7 +5948,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP mv \$TMP.$cf_so_strip \$TMP
fi fi
fi fi
@ -64,7 +64,7 @@
CF_EOF CF_EOF
fi fi
@@ -5899,23 +5902,23 @@ case "$MANPAGE_FORMAT" in @@ -5954,23 +5957,23 @@ case "$MANPAGE_FORMAT" in
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
if test "\$form" = format ; then if test "\$form" = format ; then
# BSDI installs only .0 suffixes in the cat directories # BSDI installs only .0 suffixes in the cat directories
@ -94,7 +94,7 @@
for cf_alias in \$aliases for cf_alias in \$aliases
do do
if test "\$section" = 1 ; then if test "\$section" = 1 ; then
@@ -5924,7 +5927,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -5979,7 +5982,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f "\$cf_alias\${suffix}" ; then if test -f "\$cf_alias\${suffix}" ; then
@ -103,7 +103,7 @@
then then
continue continue
fi fi
@@ -5934,18 +5937,18 @@ CF_EOF @@ -5989,18 +5992,18 @@ CF_EOF
case "x$LN_S" in case "x$LN_S" in
(*-f) (*-f)
cat >>$cf_edit_man <<CF_EOF cat >>$cf_edit_man <<CF_EOF
@ -125,7 +125,7 @@
echo ".so \$cf_source" >\$TMP echo ".so \$cf_source" >\$TMP
CF_EOF CF_EOF
if test -n "$cf_compress" ; then if test -n "$cf_compress" ; then
@@ -5965,9 +5968,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -6020,9 +6023,9 @@ cat >>$cf_edit_man <<CF_EOF
) )
) )
elif test "\$verb" = removing ; then elif test "\$verb" = removing ; then
@ -138,7 +138,7 @@
) )
test -d "\$cf_subdir\${section}" && test -d "\$cf_subdir\${section}" &&
test -n "\$aliases" && ( test -n "\$aliases" && (
@@ -5987,6 +5990,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -6042,6 +6045,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -354,15 +354,15 @@
--- man/ncurses.3x --- man/ncurses.3x
+++ man/ncurses.3x 2021-11-22 07:20:23.625974038 +0000 +++ man/ncurses.3x 2021-11-22 07:20:23.625974038 +0000
@@ -139,6 +139,10 @@ after the shell environment variable \fB @@ -139,6 +139,10 @@ after the shell environment variable \fB
[See \fBterminfo\fR(\*n) for further details.] [See \fBterminfo\fP(\*n) for further details.]
.SS Datatypes .SS Datatypes
.PP .PP
+Beware: the terminal your program is running may or may not have +Beware: the terminal your program is running may or may not have
+the features you expect. Ncurses makes no attempt to check available +the features you expect. Ncurses makes no attempt to check available
+features in advance. This is upon the programmer. +features in advance. This is upon the programmer.
+.PP +.PP
The \fBncurses\fR library permits manipulation of data structures, The \fBncurses\fP library permits manipulation of data structures,
called \fIwindows\fR, which can be thought of as two-dimensional called \fIwindows\fP, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen. arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in --- misc/gen-pkgconfig.in
+++ misc/gen-pkgconfig.in 2021-11-22 07:20:23.625974038 +0000 +++ misc/gen-pkgconfig.in 2021-11-22 07:20:23.625974038 +0000

View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Mon Jan 10 09:08:02 UTC 2022 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20220101
+ add section on releasing memory to curs_termcap.3x and
curs_terminfo.3x manpages.
- Add ncurses patch 20211225
+ improve markup, e.g., for external manpage links in the manpages
(prompted by report by Helge Kreutzmann).
- Add ncurses patch 20211219
+ install ncurses-examples programs in libexecdir, adding a wrapper
script to invoke those.
+ add help-screen and screen-dump to test/combine.c
- Rename package ncurses-tests to ncurses-examples as upstream does
-------------------------------------------------------------------
Tue Dec 14 08:19:44 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20211211
+ add test/combine.c, to demo/test combining characters.
-------------------------------------------------------------------
Mon Dec 6 13:54:34 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20211204
+ improve configure check for getttynam (report by Werner Fink).
- Correct offsets of patch ncurses-6.3.dif
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 29 13:18:21 UTC 2021 - Dr. Werner Fink <werner@suse.de> Mon Nov 29 13:18:21 UTC 2021 - Dr. Werner Fink <werner@suse.de>

View File

@ -1,7 +1,7 @@
# #
# spec file for package ncurses # spec file for package ncurses
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -124,13 +124,15 @@ tset -- terminal-initialization utility
reset -- terminal initialization utility reset -- terminal initialization utility
%package -n ncurses-tests %package -n ncurses-examples
Provides: ncurses-tests = 6.3.20211127
Obsoletes: ncurses-tests <= 6.3.20211127
Summary: Tools using the new curses libraries Summary: Tools using the new curses libraries
License: MIT License: MIT
Group: System/Base Group: System/Base
Requires: ncurses-utils >= %{version} Requires: ncurses-utils >= %{version}
%description -n ncurses-tests %description -n ncurses-examples
The ncurses based test programs, that is a set of tools The ncurses based test programs, that is a set of tools
showing the features of the new curses libraries. showing the features of the new curses libraries.
@ -686,7 +688,7 @@ mv tack-* tack
CFLAGS="$CFLAGS -I%{root}%{_incdir}/ncursesw/ -I%{root}%{_incdir}/" \ CFLAGS="$CFLAGS -I%{root}%{_incdir}/ncursesw/ -I%{root}%{_incdir}/" \
LDFLAGS="$LDFLAGS -Wl,-rpath-link=%{root}%{_libdir} -L%{root}%{_libdir}" \ LDFLAGS="$LDFLAGS -Wl,-rpath-link=%{root}%{_libdir} -L%{root}%{_libdir}" \
LIBS="$LDFLAGS" \ LIBS="$LDFLAGS" \
./configure --with-ncursesw --with-screen=ncursesw --enable-widec --enable-wattr-macros --prefix=%{_prefix} --bindir=%{_libexecdir}/ncurses --datadir=%{_datadir}/ncurses ./configure --with-ncursesw --with-screen=ncursesw --enable-widec --enable-wattr-macros --prefix=%{_prefix} --datadir=%{_datadir}/ncurses
LD_LIBRARY_PATH=%{root}%{_libdir} \ LD_LIBRARY_PATH=%{root}%{_libdir} \
%if %{with usepcre2} %if %{with usepcre2}
@ -833,7 +835,7 @@ includedir5=%{_incdir}/ncurses5' "$pc"
CFLAGS="$CFLAGS -I%{root}%{_incdir}ncurses/ -I%{root}%{_incdir}/" \ CFLAGS="$CFLAGS -I%{root}%{_incdir}ncurses/ -I%{root}%{_incdir}/" \
LDFLAGS="$LDFLAGS -Wl,-rpath-link=%{root}%{_libdir} -L%{root}%{_libdir}" \ LDFLAGS="$LDFLAGS -Wl,-rpath-link=%{root}%{_libdir} -L%{root}%{_libdir}" \
LIBS="$LDFLAGS" \ LIBS="$LDFLAGS" \
./configure --with-ncurses --with-screen=ncurses --disable-widec --disable-wattr-macros --prefix=%{_prefix} --bindir=%{_libexecdir}/ncurses --datadir=%{_datadir}/ncurses ./configure --with-ncurses --with-screen=ncurses --disable-widec --disable-wattr-macros --prefix=%{_prefix} --datadir=%{_datadir}/ncurses
LD_LIBRARY_PATH=%{root}%{_libdir} \ LD_LIBRARY_PATH=%{root}%{_libdir} \
%if %{with usepcre2} %if %{with usepcre2}
make %{?_smp_mflags} TEST_ARGS='-lform -lmenu -lpanel -lncurses -ltic -ltinfo -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8' make %{?_smp_mflags} TEST_ARGS='-lform -lmenu -lpanel -lncurses -ltic -ltinfo -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8'
@ -1148,7 +1150,7 @@ pushd test
mkdir -p ./%{_mandir}/man6 mkdir -p ./%{_mandir}/man6
cp -p $(find -name '*.6') .%{_mandir}/man6/ cp -p $(find -name '*.6') .%{_mandir}/man6/
(cd usr/; tar -cpSf - .) | tar -xpsSf - -C %{buildroot}%{_prefix} (cd usr/; tar -cpSf - .) | tar -xpsSf - -C %{buildroot}%{_prefix}
install -m 0755 %{S:8} %{buildroot}%{_libexecdir}/ncurses/ install -m 0755 %{S:8} %{buildroot}%{_libexecdir}/ncurses-examples/
popd popd
%if 0%{?_crossbuild} %if 0%{?_crossbuild}
@ -1167,20 +1169,7 @@ pushd test
expect -d <<-'EOF' expect -d <<-'EOF'
set env(TERM) xterm set env(TERM) xterm
set timeout 20 set timeout 20
spawn -noecho ".%{_libexecdir}/ncurses/newdemo" spawn -noecho ".%{_libexecdir}/ncurses-examples/newdemo"
send -- "x"
sleep 5
send -- "x"
sleep 5
send -- "x"
sleep 5
send -- "q"
wait -nowait
EOF
expect -d <<-'EOF'
set env(TERM) xterm
set timeout 20
spawn -noecho ".%{_libexecdir}/ncurses/newdemo"
send -- "x" send -- "x"
sleep 5 sleep 5
send -- "x" send -- "x"
@ -1238,10 +1227,11 @@ popd
%doc %{_mandir}/man5/*%{ext_man} %doc %{_mandir}/man5/*%{ext_man}
%doc AUTHORS %doc AUTHORS
%files -n ncurses-tests %files -n ncurses-examples
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_libexecdir}/ncurses/ %{_bindir}/ncurses-examples
%{_libexecdir}/ncurses/* %dir %{_libexecdir}/ncurses-examples/
%{_libexecdir}/ncurses-examples/*
%dir %{_datadir}/ncurses/ %dir %{_datadir}/ncurses/
%{_datadir}/ncurses/* %{_datadir}/ncurses/*
%doc %{_mandir}/man6/*%{ext_man} %doc %{_mandir}/man6/*%{ext_man}