rpm/ncurses
SHA256
1
0
Fork 0
forked from pool/ncurses
Code Pull Requests Activity

Updating link to change in openSUSE:Factory/ncurses revision 230

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=3438c2bc6957bfb9df3de9a58f1da3c9
This commit is contained in:
OBS User buildservice-autocommit 2023-02-02 17:06:50 +00:00 committed by Git OBS Bridge
parent ec7bdc6041
commit f7e7a71cf3
3 changed files with 55 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:86ceb9544977793df8e69a11931a8dc60818ad1e7293e774e4c8cc2dbd847d22 oid sha256:a0efb6fb46ef353e26615f6bf29745e2972ea501360c7063b9f22d53798b1f49
size 239233 size 264906

86
ncurses-6.4.dif
View File

@ -18,8 +18,8 @@
16 files changed, 207 insertions(+), 70 deletions(-) 16 files changed, 207 insertions(+), 70 deletions(-)
--- aclocal.m4 --- aclocal.m4
+++ aclocal.m4 2023-01-16 08:31:57.044889237 +0000 +++ aclocal.m4 2023-01-23 13:06:54.872588922 +0000
@@ -5988,12 +5988,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -5986,12 +5986,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
@ -37,7 +37,7 @@
sed -f "$cf_man_alias" \\ sed -f "$cf_man_alias" \\
CF_EOF CF_EOF
@@ -6003,7 +6006,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -6001,7 +6004,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
@ -46,21 +46,21 @@
CF_EOF CF_EOF
fi fi
@@ -6043,7 +6046,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -6041,7 +6044,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP mv \$TMP.$cf_manpage_so_strip \$TMP
fi fi
fi fi
- cf_target="\$cf_target.$cf_so_strip" - cf_target="\$cf_target.$cf_manpage_so_strip"
+ t="\$t.$cf_so_strip" + t="\$t.$cf_manpage_so_strip"
CF_EOF CF_EOF
fi fi
@@ -6052,23 +6055,23 @@ case "$MANPAGE_FORMAT" in @@ -6050,23 +6053,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
- cf_target="\`echo \$cf_target|sed -e 's/\\.[[1-9]]\\+[[a-z]]*/.0/'\`" - cf_target="\`echo \$cf_target|sed -e 's/\\.[[1-9]]\\+[[a-z]]*/.0/'\`"
+ t="\`echo \$t|sed -e 's/\.[[1-9]]\+[[a-z]]*/.0/'\`" + t="\`echo \$t|sed -e 's/\\.[[1-9]]\\+[[a-z]]*/.0/'\`"
fi fi
CF_EOF CF_EOF
;; ;;
@ -79,13 +79,13 @@
cd "\$cf_subdir\${section}" && ( cd "\$cf_subdir\${section}" && (
- cf_source=\`echo "\$cf_target" |sed -e 's%^.*/\\([[^/]][[^/]]*/[[^/]][[^/]]*$\\)%\\1%'\` - cf_source=\`echo "\$cf_target" |sed -e 's%^.*/\\([[^/]][[^/]]*/[[^/]][[^/]]*$\\)%\\1%'\`
+ cf_source=\`echo "\$t" |sed -e 's%^.*/\\([[^/]][[^/]]*/[[^/]][[^/]]*$\\)%\\1%'\` + cf_source=\`echo "\$t" |sed -e 's%^.*/\\([[^/]][[^/]]*/[[^/]][[^/]]*$\\)%\\1%'\`
test -n "$cf_so_strip" && cf_source=\`echo "\$cf_source" |sed -e 's%\\.$cf_so_strip\$%%'\` test -n "$cf_manpage_so_strip" && cf_source=\`echo "\$cf_source" |sed -e 's%\\.$cf_manpage_so_strip\$%%'\`
- cf_target=\`basename "\$cf_target"\` - cf_target=\`basename "\$cf_target"\`
+ t=\`basename "\$t"\` + t=\`basename "\$t"\`
for cf_alias in \$aliases for cf_alias in \$aliases
do do
if test "\$section" = 1 ; then if test "\$section" = 1 ; then
@@ -6077,7 +6080,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -6075,7 +6078,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
@ -94,7 +94,7 @@
then then
continue continue
fi fi
@@ -6087,18 +6090,18 @@ CF_EOF @@ -6085,18 +6088,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
@ -115,8 +115,8 @@
+ elif test "\$t" != "\$cf_alias\${suffix}" ; then + elif test "\$t" != "\$cf_alias\${suffix}" ; then
echo ".so \$cf_source" >\$TMP echo ".so \$cf_source" >\$TMP
CF_EOF CF_EOF
if test -n "$cf_compress" ; then if test -n "$cf_manpage_compress" ; then
@@ -6118,9 +6121,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -6116,9 +6119,9 @@ cat >>$cf_edit_man <<CF_EOF
) )
) )
elif test "\$verb" = removing ; then elif test "\$verb" = removing ; then
@ -129,7 +129,7 @@
) )
test -d "\$cf_subdir\${section}" && test -d "\$cf_subdir\${section}" &&
test -n "\$aliases" && ( test -n "\$aliases" && (
@@ -6140,6 +6143,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -6138,6 +6141,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -138,7 +138,7 @@
esac esac
done done
--- configure --- configure
+++ configure 2023-01-16 08:31:57.044889237 +0000 +++ configure 2023-01-23 13:08:03.243347215 +0000
@@ -6457,7 +6457,7 @@ echo $ECHO_N "checking for an rpath opti @@ -6457,7 +6457,7 @@ echo $ECHO_N "checking for an rpath opti
fi fi
;; ;;
@ -168,7 +168,7 @@
do do
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
@@ -15255,12 +15255,15 @@ cat >>$cf_edit_man <<CF_EOF @@ -15252,12 +15252,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
@ -186,7 +186,7 @@
sed -f "$cf_man_alias" \\ sed -f "$cf_man_alias" \\
CF_EOF CF_EOF
@@ -15270,7 +15273,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -15267,7 +15270,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
@ -195,16 +195,16 @@
CF_EOF CF_EOF
fi fi
@@ -15310,7 +15313,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -15307,7 +15310,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP mv \$TMP.$cf_manpage_so_strip \$TMP
fi fi
fi fi
- cf_target="\$cf_target.$cf_so_strip" - cf_target="\$cf_target.$cf_manpage_so_strip"
+ t="\$t.$cf_so_strip" + t="\$t.$cf_manpage_so_strip"
CF_EOF CF_EOF
fi fi
@@ -15319,23 +15322,23 @@ case "$MANPAGE_FORMAT" in @@ -15316,23 +15319,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
@ -228,13 +228,13 @@
cd "\$cf_subdir\${section}" && ( cd "\$cf_subdir\${section}" && (
- cf_source=\`echo "\$cf_target" |sed -e 's%^.*/\\([^/][^/]*/[^/][^/]*$\\)%\\1%'\` - cf_source=\`echo "\$cf_target" |sed -e 's%^.*/\\([^/][^/]*/[^/][^/]*$\\)%\\1%'\`
+ cf_source=\`echo "\$t" |sed -e 's%^.*/\\([^/][^/]*/[^/][^/]*$\\)%\\1%'\` + cf_source=\`echo "\$t" |sed -e 's%^.*/\\([^/][^/]*/[^/][^/]*$\\)%\\1%'\`
test -n "$cf_so_strip" && cf_source=\`echo "\$cf_source" |sed -e 's%\\.$cf_so_strip\$%%'\` test -n "$cf_manpage_so_strip" && cf_source=\`echo "\$cf_source" |sed -e 's%\\.$cf_manpage_so_strip\$%%'\`
- cf_target=\`basename "\$cf_target"\` - cf_target=\`basename "\$cf_target"\`
+ t=\`basename "\$t"\` + t=\`basename "\$t"\`
for cf_alias in \$aliases for cf_alias in \$aliases
do do
if test "\$section" = 1 ; then if test "\$section" = 1 ; then
@@ -15344,7 +15347,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -15341,7 +15344,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
@ -243,7 +243,7 @@
then then
continue continue
fi fi
@@ -15354,18 +15357,18 @@ CF_EOF @@ -15351,18 +15354,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
@ -264,8 +264,8 @@
+ elif test "\$t" != "\$cf_alias\${suffix}" ; then + elif test "\$t" != "\$cf_alias\${suffix}" ; then
echo ".so \$cf_source" >\$TMP echo ".so \$cf_source" >\$TMP
CF_EOF CF_EOF
if test -n "$cf_compress" ; then if test -n "$cf_manpage_compress" ; then
@@ -15385,9 +15388,9 @@ cat >>$cf_edit_man <<CF_EOF @@ -15382,9 +15385,9 @@ cat >>$cf_edit_man <<CF_EOF
) )
) )
elif test "\$verb" = removing ; then elif test "\$verb" = removing ; then
@ -278,7 +278,7 @@
) )
test -d "\$cf_subdir\${section}" && test -d "\$cf_subdir\${section}" &&
test -n "\$aliases" && ( test -n "\$aliases" && (
@@ -15407,6 +15410,7 @@ cat >>$cf_edit_man <<CF_EOF @@ -15404,6 +15407,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0" # echo ".hy 0"
cat \$TMP cat \$TMP
fi fi
@ -287,7 +287,7 @@
esac esac
done done
--- include/curses.h.in --- include/curses.h.in
+++ include/curses.h.in 2023-01-09 11:47:28.916395348 +0000 +++ include/curses.h.in 2023-01-23 13:00:47.039268881 +0000
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
#ifdef __cplusplus #ifdef __cplusplus
@ -308,7 +308,7 @@
* We need FILE, etc. Include this before checking any feature symbols. * We need FILE, etc. Include this before checking any feature symbols.
*/ */
--- include/termcap.h.in --- include/termcap.h.in
+++ include/termcap.h.in 2023-01-09 11:47:28.916395348 +0000 +++ include/termcap.h.in 2023-01-23 13:00:47.039268881 +0000
@@ -47,6 +47,8 @@ extern "C" @@ -47,6 +47,8 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -319,7 +319,7 @@
#undef NCURSES_OSPEED #undef NCURSES_OSPEED
--- include/tic.h --- include/tic.h
+++ include/tic.h 2023-01-09 11:47:28.916395348 +0000 +++ include/tic.h 2023-01-23 13:00:47.039268881 +0000
@@ -236,12 +236,12 @@ struct user_table_entry @@ -236,12 +236,12 @@ struct user_table_entry
*/ */
@ -336,7 +336,7 @@
#define CANCELLED_STRING (char *)(-1) #define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames.in --- man/man_db.renames.in
+++ man/man_db.renames.in 2023-01-09 11:47:28.916395348 +0000 +++ man/man_db.renames.in 2023-01-23 13:00:47.039268881 +0000
@@ -164,6 +164,7 @@ term.7 term.7 @@ -164,6 +164,7 @@ term.7 term.7
term_variables.3x terminfo_variables.3ncurses term_variables.3x terminfo_variables.3ncurses
terminfo.5 terminfo.5 terminfo.5 terminfo.5
@ -354,7 +354,7 @@
# #
getty.1 getty.8 getty.1 getty.8
--- man/ncurses.3x --- man/ncurses.3x
+++ man/ncurses.3x 2023-01-09 11:47:28.916395348 +0000 +++ man/ncurses.3x 2023-01-23 13:00:47.039268881 +0000
@@ -139,6 +139,10 @@ after the shell environment variable \fB @@ -139,6 +139,10 @@ after the shell environment variable \fB
[See \fBterminfo\fP(\*n) for further details.] [See \fBterminfo\fP(\*n) for further details.]
.SS Datatypes .SS Datatypes
@ -367,7 +367,7 @@
called \fIwindows\fP, 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 2023-01-09 11:47:28.916395348 +0000 +++ misc/gen-pkgconfig.in 2023-01-23 13:00:47.039268881 +0000
@@ -83,6 +83,8 @@ if [ "$includedir" != "/usr/include" ]; @@ -83,6 +83,8 @@ if [ "$includedir" != "/usr/include" ];
fi fi
@ -440,7 +440,7 @@
if [ $name = $MAIN_LIBRARY ] if [ $name = $MAIN_LIBRARY ]
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2023-01-16 08:34:35.237940172 +0000 +++ misc/terminfo.src 2023-01-23 13:00:47.043268809 +0000
@@ -305,7 +305,9 @@ dumb|80-column dumb tty, @@ -305,7 +305,9 @@ dumb|80-column dumb tty,
am, am,
cols#80, cols#80,
@ -704,7 +704,7 @@
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
--- ncurses/Makefile.in --- ncurses/Makefile.in
+++ ncurses/Makefile.in 2023-01-09 11:47:28.920395274 +0000 +++ ncurses/Makefile.in 2023-01-23 13:00:47.043268809 +0000
@@ -242,7 +242,7 @@ $(DESTDIR)$(libdir) : @@ -242,7 +242,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@ ../lib : ; mkdir $@
@ -715,7 +715,7 @@
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
FGREP="@FGREP@" $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ FGREP="@FGREP@" $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
--- ncurses/run_cmd.sh --- ncurses/run_cmd.sh
+++ ncurses/run_cmd.sh 2023-01-09 11:47:28.920395274 +0000 +++ ncurses/run_cmd.sh 2023-01-23 13:00:47.043268809 +0000
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -729,7 +729,7 @@
+ +
+exec /bin/sh -e ${1+"$@"} +exec /bin/sh -e ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh --- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2023-01-09 11:47:28.920395274 +0000 +++ ncurses/tinfo/MKfallback.sh 2023-01-23 13:00:47.043268809 +0000
@@ -66,14 +66,22 @@ if test $# != 0 ; then @@ -66,14 +66,22 @@ if test $# != 0 ; then
TERMINFO=`pwd`/$tmp_info TERMINFO=`pwd`/$tmp_info
export TERMINFO export TERMINFO
@ -773,7 +773,7 @@
done done
--- ncurses/tinfo/lib_setup.c --- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2023-01-09 11:47:28.920395274 +0000 +++ ncurses/tinfo/lib_setup.c 2023-01-23 13:00:47.043268809 +0000
@@ -613,6 +613,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) @@ -613,6 +613,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
} else if ((value = tigetnum("U8")) >= 0) { } else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */ result = value; /* use extension feature */
@ -785,7 +785,7 @@
result = 1; /* always broken */ result = 1; /* always broken */
} else if (strstr(env, "screen") != 0 } else if (strstr(env, "screen") != 0
--- progs/Makefile.in --- progs/Makefile.in
+++ progs/Makefile.in 2023-01-09 11:47:28.920395274 +0000 +++ progs/Makefile.in 2023-01-23 13:00:47.043268809 +0000
@@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) @@ -101,7 +101,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS) -DNCURSES_STATIC CFLAGS_NORMAL = $(CCFLAGS) -DNCURSES_STATIC
CFLAGS_DEBUG = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE CFLAGS_DEBUG = $(CCFLAGS) -DNCURSES_STATIC @CC_G_OPT@ -DTRACE
@ -805,7 +805,7 @@
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
--- test/test.priv.h --- test/test.priv.h
+++ test/test.priv.h 2023-01-09 11:47:28.920395274 +0000 +++ test/test.priv.h 2023-01-23 13:00:47.043268809 +0000
@@ -1108,12 +1108,12 @@ extern char *_nc_strstr(const char *, co @@ -1108,12 +1108,12 @@ extern char *_nc_strstr(const char *, co
#endif #endif
@ -822,7 +822,7 @@
#define CANCELLED_STRING (char *)(-1) #define CANCELLED_STRING (char *)(-1)
--- test/tracemunch --- test/tracemunch
+++ test/tracemunch 2023-01-09 11:47:28.920395274 +0000 +++ test/tracemunch 2023-01-23 13:00:47.043268809 +0000
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/env perl -#!/usr/bin/env perl
+#!/usr/bin/perl +#!/usr/bin/perl

10
ncurses.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Jan 23 13:00:25 UTC 2023 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20230121
+ correct limit-check when dumping tc/use clause via tic -I (report by
Gabriel Ravier).
+ correct a check for manpage-alias in edit_man.sh, to work with out of
tree builds (report by Sven Joachim).
- Port ncurses-6.4.dif to patch 20230121
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 16 08:30:13 UTC 2023 - Dr. Werner Fink <werner@suse.de> Mon Jan 16 08:30:13 UTC 2023 - Dr. Werner Fink <werner@suse.de>