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

Update to ncurses-6.2 patch 20210206

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=529
This commit is contained in:
Dr. Werner Fink 2021-02-08 13:52:37 +00:00 committed by Git OBS Bridge
parent 3978374aae
commit a482db674d
4 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f61ac977d629ad5c99ad6653b7eb4f9b854fcdaa13d62eea509a084f48223ac1
size 1878007
oid sha256:1d4f4b96c3d65d90902899969985bfd9243ffdc4e22f722eb8d61d1d5e558fc4
size 1920688

25
ncurses-6.2.dif
View File

@ -160,7 +160,16 @@
;;
(openbsd[2-9].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath,"
@@ -14603,12 +14603,15 @@ cat >>$cf_edit_man <<CF_EOF
@@ -7438,7 +7438,7 @@ echo "${ECHO_T}$with_pcre2" >&6
if test "x$with_pcre2" != xno ; then
cf_with_pcre2_ok=no
- for cf_with_pcre2 in libpcre2 libpcre2-posix libpcre
+ for cf_with_pcre2 in libpcre2 libpcre2-8 libpcre2-posix libpcre
do
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
@@ -14472,12 +14472,15 @@ cat >>$cf_edit_man <<CF_EOF
echo "? missing rename for \$cf_source"
cf_target="\$cf_source"
fi
@ -178,7 +187,7 @@
sed -f "$cf_man_alias" \\
CF_EOF
@@ -14618,7 +14621,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14487,7 +14490,7 @@ cat >>$cf_edit_man <<CF_EOF
CF_EOF
else
cat >>$cf_edit_man <<CF_EOF
@ -187,7 +196,7 @@
CF_EOF
fi
@@ -14658,7 +14661,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14527,7 +14530,7 @@ cat >>$cf_edit_man <<CF_EOF
mv \$TMP.$cf_so_strip \$TMP
fi
fi
@ -196,7 +205,7 @@
CF_EOF
fi
@@ -14667,23 +14670,23 @@ case "$MANPAGE_FORMAT" in
@@ -14536,23 +14539,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 +235,7 @@
for cf_alias in \$aliases
do
if test "\$section" = 1 ; then
@@ -14692,7 +14695,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14561,7 +14564,7 @@ cat >>$cf_edit_man <<CF_EOF
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f "\$cf_alias\${suffix}" ; then
@ -235,7 +244,7 @@
then
continue
fi
@@ -14702,18 +14705,18 @@ CF_EOF
@@ -14571,18 +14574,18 @@ CF_EOF
case "x$LN_S" in
(*-f)
cat >>$cf_edit_man <<CF_EOF
@ -257,7 +266,7 @@
echo ".so \$cf_source" >\$TMP
CF_EOF
if test -n "$cf_compress" ; then
@@ -14733,9 +14736,9 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14602,9 +14605,9 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test "\$verb" = removing ; then
@ -270,7 +279,7 @@
)
test -d "\$cf_subdir\${section}" &&
test -n "\$aliases" && (
@@ -14755,6 +14758,7 @@ cat >>$cf_edit_man <<CF_EOF
@@ -14624,6 +14627,7 @@ cat >>$cf_edit_man <<CF_EOF
# echo ".hy 0"
cat \$TMP
fi

12
ncurses.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Feb 8 08:46:27 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Add ncurses patch 20210206
+ provide for wide-characters as background character in wbkgrnd
(report/testcase by Anton Vidovic)
+ add name for Fedora's pcre2 to configure check for "--with-pcre2"
option, from xterm #363 -TD
+ modify adjustment in PutCharLR to restore the cursor position before
writing to the lower-right corner, rather than decrementing the
cursor column, in case it was a double-width character (cf: 20210130).
-------------------------------------------------------------------
Mon Feb 1 07:58:24 UTC 2021 - Dr. Werner Fink <werner@suse.de>

10
ncurses.spec
View File

@ -47,6 +47,7 @@ BuildRequires: pkg-config
BuildRequires: pkgconfig(libbsd)
%endif
BuildRequires: screen
BuildRequires: pkgconfig(libpcre2-8)
%if 0%{?suse_version} > 1130
BuildRequires: gpm-devel
%else
@ -494,6 +495,7 @@ mv tack-* tack
--with-default-terminfo-dir=%{_datadir}/terminfo \
--with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo \
--with-xterm-kbs=del \
--with-pcre2 \
--disable-stripping \
--disable-root-environ \
--disable-termcap \
@ -663,8 +665,8 @@ mv tack-* tack
LIBS="$LDFLAGS" \
./configure --with-ncursesw --enable-widec --prefix=$PWD
LD_LIBRARY_PATH=%{root}%{_libdir} \
make %{?_smp_mflags} TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' TEST_LIBS='-lutil -lpthread'
make install TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' TEST_LIBS='-lutil -lpthread'
make %{?_smp_mflags} TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8'
make install TEST_ARGS='-lformw -lmenuw -lpanelw -lncursesw -lticw -l%{soname_tinfo} -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8'
mv bin binw
make distclean
popd
@ -798,8 +800,8 @@ includedir5=%{_incdir}/ncurses5' "$pc"
LIBS="$LDFLAGS" \
./configure --with-ncurses --disable-widec --prefix=$PWD
LD_LIBRARY_PATH=%{root}%{_libdir} \
make %{?_smp_mflags} TEST_ARGS='-lform -lmenu -lpanel -lncurses -ltic -ltinfo -Wl,--as-needed' TEST_LIBS='-lutil -lpthread'
make install TEST_ARGS='-lform -lmenu -lpanel -lncurses -ltic -ltinfo -Wl,--as-needed' TEST_LIBS='-lutil -lpthread'
make %{?_smp_mflags} TEST_ARGS='-lform -lmenu -lpanel -lncurses -ltic -ltinfo -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8'
make install TEST_ARGS='-lform -lmenu -lpanel -lncurses -ltic -ltinfo -Wl,--as-needed' TEST_LIBS='-lutil -lpthread -lpcre2-posix -lpcre2-8'
make distclean
popd
%endif