forked from pool/ncurses
Accepting request 994114 from Base:System
- Add ncurses patch 20220806 + amend end_of_stream() to allow for input files without a final newline. + check for non-textfiles to tic. - Add ncurses patch 20220729 + fixes to build with dietlibc: + add configure check for fpathconf (report by Georg Lehner). + add configure check for math sine/cosine, needed in test/tclock, and eliminate pow() from test/hanoi (report by Georg Lehner). + use wcsnlen as an alternative to wmemchr if it is not found (adapted from patch by Georg Lehner). + trim out some unwanted linker options from ncurses*config and .pc files seen in Fedora 36+. - Port patch ncurses-6.3.dif OBS-URL: https://build.opensuse.org/request/show/994114 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=221
This commit is contained in:
commit
5e4f47ac62
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:286bd85bceeb0f8a567bb8546e4728d1c92845dd4596d5a721b9fdc6acc50c20
|
oid sha256:7ca9bf5c5edb733bd7a245c60e167c455e20ce51db243fc7f3413cbef5cdef4d
|
||||||
size 1017374
|
size 1081012
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
---
|
---
|
||||||
aclocal.m4 | 40 +++++++++-------
|
aclocal.m4 | 40 ++++++++-------
|
||||||
configure | 46 ++++++++++--------
|
configure | 46 +++++++++---------
|
||||||
include/curses.h.in | 5 +-
|
include/curses.h.in | 5 +
|
||||||
include/termcap.h.in | 2
|
include/termcap.h.in | 2
|
||||||
include/tic.h | 4 -
|
include/tic.h | 4 -
|
||||||
man/man_db.renames | 2
|
man/man_db.renames | 2
|
||||||
man/ncurses.3x | 4 +
|
man/ncurses.3x | 4 +
|
||||||
misc/gen-pkgconfig.in | 23 +++++++++
|
misc/gen-pkgconfig.in | 25 +++++++++
|
||||||
misc/terminfo.src | 107 +++++++++++++++++++++++++++++++++++++-------
|
misc/terminfo.src | 111 +++++++++++++++++++++++++++++++++++++-------
|
||||||
ncurses/Makefile.in | 2
|
ncurses/Makefile.in | 2
|
||||||
ncurses/run_cmd.sh | 11 ++++
|
ncurses/run_cmd.sh | 11 ++++
|
||||||
ncurses/tinfo/MKfallback.sh | 14 ++++-
|
ncurses/tinfo/MKfallback.sh | 14 ++++-
|
||||||
@ -15,7 +15,7 @@
|
|||||||
progs/Makefile.in | 4 -
|
progs/Makefile.in | 4 -
|
||||||
test/test.priv.h | 4 -
|
test/test.priv.h | 4 -
|
||||||
test/tracemunch | 2
|
test/tracemunch | 2
|
||||||
16 files changed, 206 insertions(+), 67 deletions(-)
|
16 files changed, 209 insertions(+), 70 deletions(-)
|
||||||
|
|
||||||
--- aclocal.m4
|
--- aclocal.m4
|
||||||
+++ aclocal.m4 2022-02-21 08:55:21.204338965 +0000
|
+++ aclocal.m4 2022-02-21 08:55:21.204338965 +0000
|
||||||
@ -386,7 +386,7 @@
|
|||||||
for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@
|
for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@
|
||||||
do
|
do
|
||||||
case $opt in
|
case $opt in
|
||||||
@@ -92,12 +94,26 @@ do
|
@@ -92,13 +94,27 @@ do
|
||||||
-specs*) # ignore linker specs-files which were used to build library
|
-specs*) # ignore linker specs-files which were used to build library
|
||||||
continue
|
continue
|
||||||
;;
|
;;
|
||||||
@ -399,6 +399,7 @@
|
|||||||
-Wl,--dynamic-linker*) # ignore ELF interpreter
|
-Wl,--dynamic-linker*) # ignore ELF interpreter
|
||||||
continue
|
continue
|
||||||
;;
|
;;
|
||||||
|
- -Wl,--as-needed|-Wl,--build-id=*|-Wl,-dT,*|-Wl,-T,*)
|
||||||
+ -Wl,-Bsymbolic-functions*) # affect symbol resolution
|
+ -Wl,-Bsymbolic-functions*) # affect symbol resolution
|
||||||
+ continue
|
+ continue
|
||||||
+ ;;
|
+ ;;
|
||||||
@ -410,10 +411,11 @@
|
|||||||
+ pop=" -Wl,--pop-state"
|
+ pop=" -Wl,--pop-state"
|
||||||
+ continue
|
+ continue
|
||||||
+ ;;
|
+ ;;
|
||||||
|
+ -Wl,--build-id=*|-Wl,-dT,*|-Wl,-T,*)
|
||||||
|
continue
|
||||||
|
;;
|
||||||
-L*)
|
-L*)
|
||||||
lib_check=`echo "x$opt" | sed -e 's/^.-L//'`
|
@@ -189,19 +205,22 @@ do
|
||||||
[ -d "$lib_check" ] || continue
|
|
||||||
@@ -186,19 +202,22 @@ do
|
|
||||||
LIBS="-l$name"
|
LIBS="-l$name"
|
||||||
|
|
||||||
desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
|
desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
|
||||||
@ -437,7 +439,7 @@
|
|||||||
desc="$desc add-on library"
|
desc="$desc add-on library"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -208,6 +227,8 @@ do
|
@@ -211,6 +230,8 @@ do
|
||||||
[ $NEED_TINFO != yes ] ; then
|
[ $NEED_TINFO != yes ] ; then
|
||||||
[ -n "$reqs" ] && reqs="$reqs, "
|
[ -n "$reqs" ] && reqs="$reqs, "
|
||||||
reqs="${reqs}${SUB_LIBRARY}${suffix}"
|
reqs="${reqs}${SUB_LIBRARY}${suffix}"
|
||||||
@ -811,7 +813,7 @@
|
|||||||
|
|
||||||
--- test/test.priv.h
|
--- test/test.priv.h
|
||||||
+++ test/test.priv.h 2022-02-21 08:55:21.212338812 +0000
|
+++ test/test.priv.h 2022-02-21 08:55:21.212338812 +0000
|
||||||
@@ -1061,12 +1061,12 @@ extern char *_nc_strstr(const char *, co
|
@@ -1065,12 +1065,12 @@ extern char *_nc_strstr(const char *, co
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* out-of-band values for representing absent capabilities */
|
/* out-of-band values for representing absent capabilities */
|
||||||
|
@ -1,3 +1,25 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Aug 9 06:33:48 UTC 2022 - Dr. Werner Fink <werner@suse.de>
|
||||||
|
|
||||||
|
- Add ncurses patch 20220806
|
||||||
|
+ amend end_of_stream() to allow for input files without a final
|
||||||
|
newline.
|
||||||
|
+ check for non-textfiles to tic.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Aug 1 06:48:23 UTC 2022 - Dr. Werner Fink <werner@suse.de>
|
||||||
|
|
||||||
|
- Add ncurses patch 20220729
|
||||||
|
+ fixes to build with dietlibc:
|
||||||
|
+ add configure check for fpathconf (report by Georg Lehner).
|
||||||
|
+ add configure check for math sine/cosine, needed in test/tclock,
|
||||||
|
and eliminate pow() from test/hanoi (report by Georg Lehner).
|
||||||
|
+ use wcsnlen as an alternative to wmemchr if it is not found
|
||||||
|
(adapted from patch by Georg Lehner).
|
||||||
|
+ trim out some unwanted linker options from ncurses*config and .pc
|
||||||
|
files seen in Fedora 36+.
|
||||||
|
- Port patch ncurses-6.3.dif
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jul 18 06:11:24 UTC 2022 - Dr. Werner Fink <werner@suse.de>
|
Mon Jul 18 06:11:24 UTC 2022 - Dr. Werner Fink <werner@suse.de>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user