pool/ncurses
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 734487 from Base:System

Browse Source 
- Add ncurses patch 20190928
  + amend the ncurse*-config and pc-files to take into account the rpath
    hack which differed between those files.
  + improve -L option filtering in ncurses*-config
  + improve recovery from error when reading command-character in
    test/ncurses.c, showing the relevant error message and not exiting on
    EINTR (cf: 20180922)
- Add library path for pkgconfig of ncurses5 as well

- Add ncurses patch 20190921
  + add a note in resizeterm manpage about top-level windows which touch
    the screen's borders.
  + modify configure-checks for gnat to identify each of the tools path
    and version.

- Add ncurses patch 20190914
  + build-fixes for Ada95 configure-script and corresponding test package

OBS-URL: https://build.opensuse.org/request/show/734487
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=161
This commit is contained in:
Dominique Leuenberger 2019-10-11 13:08:41 +00:00 committed by Git OBS Bridge
commit d91788b20f
4 changed files with 51 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ncurses-6.1-patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c7d5df9d67a19d71762e7003e6c2a5fa696558da4d43abf1954947caea2a30c
size 1857620
oid sha256:b6d8df4715c593b4eb3982bfa31cfcfe9a157a606c5297d47437f3de3ce075c7
size 1879736

42
ncurses-6.1.dif
View File

@ -31,7 +31,7 @@
#include <stdio.h>
#if defined(__cplusplus)
@@ -5199,12 +5199,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5279,12 +5279,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source
cf_target="\$cf_source"
fi
@ -49,7 +49,7 @@
sed -f $cf_man_alias \\
CF_EOF
@@ -5214,7 +5217,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5294,7 +5297,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -58,7 +58,7 @@
CF_EOF
fi
@@ -5254,7 +5257,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5334,7 +5337,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -67,7 +67,7 @@
CF_EOF
fi
@@ -5263,23 +5266,23 @@ case "$MANPAGE_FORMAT" in
@@ -5343,23 +5346,23 @@ case "$MANPAGE_FORMAT" in
cat >>$cf_edit_man <<CF_EOF
if test \$form = format ; then
# BSDI installs only .0 suffixes in the cat directories
@ -97,7 +97,7 @@
for cf_alias in \$aliases
do
if test \$section = 1 ; then
@@ -5288,7 +5291,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5368,7 +5371,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then
@ -106,7 +106,7 @@
then
continue
fi
@@ -5298,18 +5301,18 @@ CF_EOF
@@ -5378,18 +5381,18 @@ CF_EOF
case "x$LN_S" in
(*-f)
cat >>$cf_edit_man <<CF_EOF
@ -128,7 +128,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
@@ -5329,9 +5332,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5409,9 +5412,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@ -141,7 +141,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
@@ -5351,6 +5354,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -5431,6 +5434,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@ -278,7 +278,7 @@
;;
esac
done
@@ -25356,6 +25360,7 @@ if test "$with_termlib" != no ; then
@@ -25371,6 +25375,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
@ -359,24 +359,24 @@
arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in
+++ misc/gen-pkgconfig.in 2019-08-12 08:07:59.759015287 +0000
@@ -77,7 +77,7 @@ if test "$includedir" != "/usr/include"
@@ -78,7 +78,7 @@ if [ "$includedir" != "/usr/include" ];
fi
LDFLAGS=
-if test "$libdir" != "/usr/lib" ; then
+if test "$libdir" != "/usr/lib" -a "$libdir" != "/usr/lib64" ; then
-if [ "$libdir" != "/usr/lib" ]; then
+if [ "$libdir" != "/usr/lib" -a "$libdir" != "/usr/lib64" ]; then
LDFLAGS="$LDFLAGS -L\${libdir}"
fi
if test "x@EXTRA_LDFLAGS@" != "x" ; then
@@ -100,6 +100,7 @@ do
if [ "x@EXTRA_LDFLAGS@" != "x" ]; then
@@ -101,6 +101,7 @@ do
LIBS="-l$name"
desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
+ deps=
reqs=
if test $name = $MAIN_LIBRARY ; then
@@ -109,9 +110,11 @@ do
if [ $name = $MAIN_LIBRARY ]; then
@@ -110,9 +111,11 @@ do
desc="$desc terminal interface library"
elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}"
@ -388,15 +388,15 @@
desc="$desc add-on library"
fi
@@ -121,6 +124,8 @@ do
test $NEED_TINFO != yes ; then
test -n "$reqs" && reqs="$reqs, "
@@ -122,6 +125,8 @@ do
[ $NEED_TINFO != yes ] ; then
[ -n "$reqs" ] && reqs="$reqs, "
reqs="${reqs}${SUB_LIBRARY}${suffix}"
+ test -n "$deps" && deps="$deps "
+ [ -n "$deps" ] && deps="$deps "
+ deps="${deps}-l${SUB_LIBRARY}"
fi
if test $name = $MAIN_LIBRARY
if [ $name = $MAIN_LIBRARY ]
--- misc/terminfo.src
+++ misc/terminfo.src 2019-08-12 08:17:44.604230936 +0000
@@ -305,7 +305,9 @@ dumb|80-column dumb tty,

27
ncurses.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Oct 1 07:28:54 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20190928
+ amend the ncurse*-config and pc-files to take into account the rpath
hack which differed between those files.
+ improve -L option filtering in ncurses*-config
+ improve recovery from error when reading command-character in
test/ncurses.c, showing the relevant error message and not exiting on
EINTR (cf: 20180922)
- Add library path for pkgconfig of ncurses5 as well
-------------------------------------------------------------------
Mon Sep 23 06:56:28 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20190921
+ add a note in resizeterm manpage about top-level windows which touch
the screen's borders.
+ modify configure-checks for gnat to identify each of the tools path
and version.
-------------------------------------------------------------------
Mon Sep 16 06:24:42 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20190914
+ build-fixes for Ada95 configure-script and corresponding test package
-------------------------------------------------------------------
Mon Sep 9 11:25:49 UTC 2019 - Dr. Werner Fink <werner@suse.de>

1
ncurses.spec
View File

@ -691,6 +691,7 @@ mv tack-* tack
base=${base##*/}
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
sed -ri 's@^(Requires.private: ).*@\1panel5, menu5, form5, ncurses5, tinfo5@' \