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

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=248
This commit is contained in:
Dr. Werner Fink 2016-06-06 13:27:47 +00:00 committed by Git OBS Bridge
parent 822e4a6777
commit 328f94a44c
3 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:08e9d92e7a8ed415d8830243160204eca2dd49a81901a094a2ff67ce97f5e9e4
size 674062
oid sha256:ccedc2bb76a0a8ae73cb4bbad986aff534790672121945b3b7b583bb13272a20
size 745741

66
ncurses-6.0.dif
View File

@ -21,7 +21,7 @@
19 files changed, 239 insertions(+), 80 deletions(-)
--- aclocal.m4
+++ aclocal.m4 2016-05-24 07:42:18.632380196 +0000
+++ aclocal.m4 2016-06-06 13:17:10.605465091 +0000
@@ -564,7 +564,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out
@ -150,8 +150,8 @@
esac
done
--- configure
+++ configure 2016-05-24 07:42:18.636380119 +0000
@@ -5878,7 +5878,7 @@ case $cf_cv_system_name in
+++ configure 2016-06-06 13:17:10.609465016 +0000
@@ -5885,7 +5885,7 @@ case $cf_cv_system_name in
fi
;;
(linux*|gnu*|k*bsd*-gnu|freebsd*)
@ -160,7 +160,7 @@
;;
(openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath,"
@@ -11557,12 +11557,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -11564,12 +11564,15 @@ cat >>$cf_edit_man <<CF_EOF
echo '? missing rename for '\$cf_source
cf_target="\$cf_source"
fi
@ -178,7 +178,7 @@
sed -f $cf_man_alias \\
CF_EOF
@@ -11572,7 +11575,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -11579,7 +11582,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -187,7 +187,7 @@
CF_EOF
fi
@@ -11612,7 +11615,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -11619,7 +11622,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -196,7 +196,7 @@
CF_EOF
fi
@@ -11621,23 +11624,23 @@ case "$MANPAGE_FORMAT" in
@@ -11628,23 +11631,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
@ -226,7 +226,7 @@
for cf_alias in \$aliases
do
if test \$section = 1 ; then
@@ -11646,7 +11649,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -11653,7 +11656,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f \$cf_alias\${suffix} ; then
@ -235,7 +235,7 @@
then
continue
fi
@@ -11656,18 +11659,18 @@ CF_EOF
@@ -11663,18 +11666,18 @@ CF_EOF
case "x$LN_S" in
(*-f)
cat >>$cf_edit_man <<CF_EOF
@ -257,7 +257,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
@@ -11687,9 +11690,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -11694,9 +11697,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
@ -270,7 +270,7 @@
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
@@ -11709,6 +11712,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -11716,6 +11719,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi
@ -278,7 +278,7 @@
;;
esac
done
@@ -21976,6 +21980,7 @@ if test "$with_termlib" != no ; then
@@ -21987,6 +21991,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
@ -287,7 +287,7 @@
# the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME}
--- include/curses.h.in
+++ include/curses.h.in 2016-05-24 07:42:18.636380119 +0000
+++ include/curses.h.in 2016-06-06 13:17:10.609465016 +0000
@@ -165,6 +165,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
typedef @cf_cv_typeof_mmask_t@ mmask_t;
#endif
@ -299,7 +299,7 @@
* We need FILE, etc. Include this before checking any feature symbols.
*/
--- include/termcap.h.in
+++ include/termcap.h.in 2016-05-24 07:42:18.636380119 +0000
+++ include/termcap.h.in 2016-06-06 13:17:10.609465016 +0000
@@ -46,6 +46,8 @@ extern "C"
{
#endif /* __cplusplus */
@ -310,7 +310,7 @@
#undef NCURSES_CONST
--- include/tic.h
+++ include/tic.h 2016-05-24 07:42:18.636380119 +0000
+++ include/tic.h 2016-06-06 13:17:10.609465016 +0000
@@ -231,12 +231,12 @@ extern NCURSES_EXPORT(const struct alias
*/
@ -327,7 +327,7 @@
#define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames
+++ man/man_db.renames 2016-05-24 07:42:18.636380119 +0000
+++ man/man_db.renames 2016-06-06 13:17:10.609465016 +0000
@@ -167,6 +167,8 @@ tput.1 tput.1
tset.1 tset.1
vprintf.3s vprintf.3
@ -338,7 +338,7 @@
# Other:
tack.1m tack.1
--- man/ncurses.3x
+++ man/ncurses.3x 2016-05-24 07:42:18.636380119 +0000
+++ man/ncurses.3x 2016-06-06 13:17:10.609465016 +0000
@@ -121,6 +121,10 @@ after the shell environment variable \fB
[See \fBterminfo\fR(\*n) for further details.]
.SS Datatypes
@ -351,7 +351,7 @@
called \fIwindows\fR, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in
+++ misc/gen-pkgconfig.in 2016-05-24 07:42:18.636380119 +0000
+++ misc/gen-pkgconfig.in 2016-06-06 13:17:10.609465016 +0000
@@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
fi
@ -391,7 +391,7 @@
echo "** creating ${name}${suffix}.pc"
--- misc/ncurses-config.in
+++ misc/ncurses-config.in 2016-05-24 07:42:18.636380119 +0000
+++ misc/ncurses-config.in 2016-06-06 13:17:10.609465016 +0000
@@ -100,7 +100,7 @@ while test $# -gt 0; do
# compile/link
--cflags)
@ -402,7 +402,7 @@
fi
if test "${includedir}" != /usr/include ; then
--- misc/terminfo.src
+++ misc/terminfo.src 2016-05-24 07:42:18.692379030 +0000
+++ misc/terminfo.src 2016-06-06 13:17:10.613464940 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am,
cols#80,
@ -773,7 +773,7 @@
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
--- ncurses/Makefile.in
+++ ncurses/Makefile.in 2016-05-24 07:42:18.640380041 +0000
+++ ncurses/Makefile.in 2016-06-06 13:17:10.613464940 +0000
@@ -216,7 +216,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@
@ -784,7 +784,7 @@
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
--- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2016-05-24 07:42:18.640380041 +0000
+++ ncurses/curses.priv.h 2016-06-06 13:17:10.613464940 +0000
@@ -2024,6 +2024,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
@ -795,7 +795,7 @@
extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
--- ncurses/run_cmd.sh
+++ ncurses/run_cmd.sh 2016-05-24 07:42:18.640380041 +0000
+++ ncurses/run_cmd.sh 2016-06-06 13:17:10.613464940 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
@ -809,7 +809,7 @@
+
+exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2016-05-24 07:42:18.640380041 +0000
+++ ncurses/tinfo/MKfallback.sh 2016-06-06 13:17:10.613464940 +0000
@@ -68,6 +68,12 @@ else
tmp_info=
fi
@ -842,7 +842,7 @@
done
--- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2016-05-24 07:42:18.640380041 +0000
+++ ncurses/tinfo/access.c 2016-06-06 13:17:10.613464940 +0000
@@ -35,6 +35,9 @@
#include <ctype.h>
@ -885,7 +885,7 @@
_nc_access(const char *path, int mode)
{
--- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2016-05-24 07:42:18.640380041 +0000
+++ ncurses/tinfo/lib_setup.c 2016-06-06 13:17:10.613464940 +0000
@@ -584,6 +584,9 @@ _nc_locale_breaks_acs(TERMINAL * termp)
} else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */
@ -897,16 +897,16 @@
result = 1; /* always broken */
} else if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2016-05-24 07:42:18.640380041 +0000
@@ -435,6 +435,7 @@ _nc_read_file_entry(const char *const fi
int limit;
char buffer[MAX_ENTRY_SIZE + 1];
+++ ncurses/tinfo/read_entry.c 2016-06-06 13:19:34.126755471 +0000
@@ -433,6 +433,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0;
int code;
+ _nc_fsid();
if (_nc_access(filename, R_OK) < 0
|| (fp = fopen(filename, "rb")) == 0) {
TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno));
@@ -452,6 +453,7 @@ _nc_read_file_entry(const char *const fi
@@ -453,6 +454,7 @@ _nc_read_file_entry(const char *const fi
}
fclose(fp);
}
@ -915,7 +915,7 @@
return (code);
}
--- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2016-05-24 07:42:18.644379964 +0000
+++ ncurses/tinfo/read_termcap.c 2016-06-06 13:17:10.613464940 +0000
@@ -322,14 +322,18 @@ _nc_getent(
*/
if (fd >= 0) {
@ -962,7 +962,7 @@
}
if (copied != 0)
--- test/test.priv.h
+++ test/test.priv.h 2016-05-24 07:42:18.644379964 +0000
+++ test/test.priv.h 2016-06-06 13:17:10.613464940 +0000
@@ -728,12 +728,12 @@ extern char *strnames[], *strcodes[], *s
#endif

10
ncurses.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Jun 6 13:15:39 UTC 2016 - werner@suse.de
- Add ncurses patch 20160528
+ further workaround for PIE/PIC breakage which causes gpm to not link.
+ fix most cppcheck warnings, mostly style, in ncurses library.
- Add ncurses patch 20160604
+ correct logic for -f option in test/demo_terminfo.c
+ add test/list_keys.c
-------------------------------------------------------------------
Tue May 24 07:41:19 UTC 2016 - werner@suse.de