diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index 74022f0..b8548d0 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:f61ac977d629ad5c99ad6653b7eb4f9b854fcdaa13d62eea509a084f48223ac1 -size 1878007 +oid sha256:1d4f4b96c3d65d90902899969985bfd9243ffdc4e22f722eb8d61d1d5e558fc4 +size 1920688 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index 5cfb7f6..2a4c2be 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -160,7 +160,16 @@ ;; (openbsd[2-9].*|mirbsd*) LD_RPATH_OPT="-Wl,-rpath," -@@ -14603,12 +14603,15 @@ cat >>$cf_edit_man <&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_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -14733,9 +14736,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man < + +- 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 diff --git a/ncurses.spec b/ncurses.spec index 9683882..46e1bad 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -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