From 202d65c0468acd326cee1fc539292f5632de31bfddbeee2bc3abd8e62588b2df Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 9 Mar 2021 11:25:12 +0000 Subject: [PATCH] Update to ncurses-6.2 patch 20210306 OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=533 --- ncurses-6.2-patches.tar.bz2 | 4 ++-- ncurses-6.2.dif | 2 +- ncurses.changes | 24 ++++++++++++++++++++++++ ncurses.spec | 15 +++++++++++++-- 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index 9b2c503..eab1840 100644 --- a/ncurses-6.2-patches.tar.bz2 +++ b/ncurses-6.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:320df657656585954a583758abf76e2d13a95333741c50ee6307691fbdd07ceb -size 1943815 +oid sha256:1a3b21ac4bdea232b8833d71bf9b8ff5a47474733404463f655a54d789c01437 +size 1965955 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index 617acda..719bbea 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -860,7 +860,7 @@ --- test/test.priv.h +++ test/test.priv.h 2021-01-11 07:27:32.121419944 +0000 -@@ -1024,12 +1024,12 @@ extern char *_nc_strstr(const char *, co +@@ -1027,12 +1027,12 @@ extern char *_nc_strstr(const char *, co #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses.changes b/ncurses.changes index a9af0f7..6cc9153 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Mar 9 11:16:31 UTC 2021 - Dr. Werner Fink + +- Only libpcre2 for ncurses ABI 6 +- Make linker script fpr ABI 6 check for needed libpcre2 + +------------------------------------------------------------------- +Tue Mar 9 09:02:47 UTC 2021 - Dr. Werner Fink + +- Add ncurses patch 20210306 + + improved test/test_parm.c, by limiting the tests to capabilities + that might have parameters or padding, and combined with tputs test. + + improve discussion of padding versus tparm and tputs in + man/curs_terminfo.3x + + update portability note for FreeBSD in man/tput.1 + +------------------------------------------------------------------- +Mon Mar 1 07:15:42 UTC 2021 - Dr. Werner Fink + +- Add ncurses patch 20210227 + + modify tic/infocmp to eliminate unnecessary "\" to escape ":" in + terminfo format. + + add check in tic for duplicate "use=" clauses. + ------------------------------------------------------------------- Mon Feb 22 08:41:45 UTC 2021 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index e6debbe..ca9fd11 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -705,6 +705,9 @@ mv tack-* tack --disable-opaque-panel \ --disable-ext-mouse \ --disable-widec \ +%if %{with usepcre2} + --without-pcre2 \ +%endif --with-termlib=tinfo \ --with-ticlib=tic \ %if %{with symversion} @@ -846,6 +849,9 @@ includedir5=%{_incdir}/ncurses5' "$pc" --disable-opaque-panel \ --disable-ext-mouse \ --enable-widec \ +%if %{with usepcre2} + --without-pcre2 \ +%endif --with-termlib=%{soname_tinfo} \ --with-ticlib=ticw \ %if %{with symversion} @@ -895,6 +901,11 @@ includedir5=%{_incdir}/ncurses5' "$pc" %{root}%{_bindir}/ncursesw5-config %install +%if %{with usepcre2} + pcre2="-lpcre2-posix -lpcre2-8" +%else + pcre2="" +%endif PATH=$PWD/gzip:$PATH (cd %{root}/; tar -cpSf - *)|tar -xpsSf - -C %{buildroot}/ rm -rf %{root} @@ -913,12 +924,12 @@ includedir5=%{_incdir}/ncurses5' "$pc" libncursesw*) rm -f ${lnk} echo '/* GNU ld script */' > ${lnk} - echo "INPUT(${lib} AS_NEEDED(-l%{soname_tinfo} -ldl))" >> ${lnk} + echo "INPUT(${lib} AS_NEEDED(-l%{soname_tinfo} -ldl $pcre2))" >> ${lnk} ;; libncurses*) rm -f ${lnk} echo '/* GNU ld script */' > ${lnk} - echo "INPUT(${lib} AS_NEEDED(-ltinfo -ldl))" >> ${lnk} + echo "INPUT(${lib} AS_NEEDED(-ltinfo -ldl $pcre2))" >> ${lnk} ;; *) ln -sf ${lib} %{buildroot}%{_libdir}/${model}.so esac