diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index 51a565a..469b3d2 100644 --- a/ncurses-5.9-ibm327x.dif +++ b/ncurses-5.9-ibm327x.dif @@ -4,7 +4,7 @@ --- misc/terminfo.src +++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000 -@@ -16690,8 +16690,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -16714,8 +16714,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2 index 0a58ffa..03481d0 100644 --- a/ncurses-6.1-patches.tar.bz2 +++ b/ncurses-6.1-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebc5f17257e154cd75855ed3220643fe8435a4ce0d6aeed29958c62fe11e866a -size 1420839 +oid sha256:dbc0a08f023e71a98d10fec35cd0da19d63886f925d3aa7af9708a2397f076db +size 1463006 diff --git a/ncurses-6.1.dif b/ncurses-6.1.dif index 40bd4ad..9854054 100644 --- a/ncurses-6.1.dif +++ b/ncurses-6.1.dif @@ -21,7 +21,7 @@ 19 files changed, 248 insertions(+), 80 deletions(-) --- aclocal.m4 -+++ aclocal.m4 2019-02-06 07:51:48.441355403 +0000 ++++ aclocal.m4 2019-04-01 07:18:56.549107037 +0000 @@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out @@ -31,7 +31,7 @@ #include #if defined(__cplusplus) -@@ -4950,12 +4950,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 <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_compress" ; then -@@ -5080,9 +5083,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <, rmul=\EG0$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, @@ -747,7 +747,7 @@ am, da, db, xhp, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, -@@ -12273,6 +12356,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit +@@ -12297,6 +12380,7 @@ msk22714|mskermit22714|UCB MS-DOS Kermit # at support for the VT320 itself. # Please send changes with explanations to bug-gnu-emacs@prep.ai.mit.edu. # (vt320-k3: I added / based on the init string -- esr) @@ -755,7 +755,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulation, am, eslok, hs, km, mir, msgr, xenl, cols#80, it#8, lines#49, pb#9600, vt#3, -@@ -12282,7 +12366,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio +@@ -12306,7 +12390,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, @@ -764,7 +764,7 @@ dsl=\E[0$~, ech=\E[%p1%dX, ed=\E[J, el=\E[K, flash=\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[?5l\E[?5h$<100/>\E[ ?5l, -@@ -16700,7 +16784,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -16724,7 +16808,7 @@ ibm3101|i3101|IBM 3101-10, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH, @@ -773,7 +773,7 @@ is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B, sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%; %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t -@@ -16958,7 +17042,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -16982,7 +17066,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De tbc=\E[3g, # "Megapel" refers to the display adapter, which was used with the IBM RT # aka IBM 6150. @@ -783,7 +783,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 2019-02-06 07:51:48.453355178 +0000 ++++ ncurses/Makefile.in 2019-04-01 07:18:56.553106962 +0000 @@ -221,7 +221,7 @@ $(DESTDIR)$(libdir) : ../lib : ; mkdir $@ @@ -794,8 +794,8 @@ ./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 2019-02-06 07:51:48.453355178 +0000 -@@ -2224,6 +2224,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec ++++ ncurses/curses.priv.h 2019-04-01 07:18:56.553106962 +0000 +@@ -2235,6 +2235,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); extern NCURSES_EXPORT(int) _nc_access (const char *, int); @@ -805,7 +805,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 2019-02-06 07:51:48.453355178 +0000 ++++ ncurses/run_cmd.sh 2019-04-01 07:18:56.553106962 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -819,7 +819,7 @@ + +exec ${1+"$@"} --- ncurses/tinfo/MKfallback.sh -+++ ncurses/tinfo/MKfallback.sh 2019-02-06 07:51:48.453355178 +0000 ++++ ncurses/tinfo/MKfallback.sh 2019-04-01 07:18:56.553106962 +0000 @@ -68,6 +68,12 @@ else tmp_info= fi @@ -852,7 +852,7 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2019-02-06 08:09:01.662042242 +0000 ++++ ncurses/tinfo/access.c 2019-04-01 07:18:56.553106962 +0000 @@ -30,6 +30,10 @@ * Author: Thomas E. Dickey * ****************************************************************************/ @@ -896,7 +896,7 @@ _nc_access(const char *path, int mode) { --- ncurses/tinfo/lib_setup.c -+++ ncurses/tinfo/lib_setup.c 2019-02-06 07:51:48.457355102 +0000 ++++ ncurses/tinfo/lib_setup.c 2019-04-01 07:18:56.557106886 +0000 @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -908,7 +908,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- ncurses/tinfo/read_entry.c -+++ ncurses/tinfo/read_entry.c 2019-02-06 07:51:48.457355102 +0000 ++++ ncurses/tinfo/read_entry.c 2019-04-01 07:18:56.557106886 +0000 @@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi FILE *fp = 0; int code; @@ -926,7 +926,7 @@ return (code); } --- ncurses/tinfo/read_termcap.c -+++ ncurses/tinfo/read_termcap.c 2019-02-06 07:51:48.457355102 +0000 ++++ ncurses/tinfo/read_termcap.c 2019-04-01 07:18:56.557106886 +0000 @@ -322,14 +322,18 @@ _nc_getent( */ if (fd >= 0) { @@ -973,7 +973,7 @@ } if (copied != 0) --- progs/Makefile.in -+++ progs/Makefile.in 2019-02-06 07:51:48.457355102 +0000 ++++ progs/Makefile.in 2019-04-01 07:18:56.557106886 +0000 @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE @@ -993,8 +993,8 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2019-02-06 07:51:48.457355102 +0000 -@@ -944,12 +944,12 @@ extern char *strnames[], *strcodes[], *s ++++ test/test.priv.h 2019-04-01 07:18:56.557106886 +0000 +@@ -993,12 +993,12 @@ extern char * _nc_strstr (const char *, #endif /* out-of-band values for representing absent capabilities */ diff --git a/ncurses.changes b/ncurses.changes index db0bfd0..4e2c202 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,72 @@ +------------------------------------------------------------------- +Wed May 15 11:43:33 UTC 2019 - Dr. Werner Fink + +- Make pkg-config files .pc consistent + +------------------------------------------------------------------- +Mon May 13 07:51:13 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20190511 + + fix a spurious blank line seen with "infocmp -1fx xterm+x11mouse" + + add checks in repair_subwindows() to keep the current position and + scroll-margins inside the resized subwindow. + + add a limit check in newline_forces_scroll() for the case where the + row is inside scroll-margins, but not at the end (report by Toshio + Kuratomi, cf: 20170729). + + corrected a warning message in tic for extended capabilities versus + number of parameters. + +------------------------------------------------------------------- +Fri May 10 07:55:17 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20190504 + + improve workaround for Solaris wcwidth versus line-drawing characters + (report by Pavel Stehule). + + add special case in tic to validate RGB string-capability extension. + + corrected string/parameter-field for RGB in Caps-ncurses. + +------------------------------------------------------------------- +Mon Apr 29 07:04:37 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20190427 + + corrected problem in terminfo load/realignment which prevented + infocmp from comparing extended capabilities with the same name + but different types. + +------------------------------------------------------------------- +Tue Apr 23 11:32:35 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20190420 + + improve ifdef's for TABSIZE variable, to help with AIX/HPUX ports. +- Add ncurses patch 20190413 + + check for TABSIZE variable in test/configure script. + + used test/test_arrays.c to improve Caps.aix1 and Caps.hpux11 + + corrected filtering of comments in MKparametrized.sh + + reduce duplication across Caps* files by moving some parts which do + not depend on order into Caps-ncurses. + +------------------------------------------------------------------- +Mon Apr 8 06:42:14 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20190406 + + modify MKcaptab.sh, MKkey_defs.sh, and MKhashsize.sh to handle + split-up Caps-files. + + build-fixes if extended-functions are disabled. + +------------------------------------------------------------------- +Mon Apr 1 07:18:00 UTC 2019 - Dr. Werner Fink + +- Add ncurses patch 20190330 + + add "screen5", to mention italics (report by Stefan Assmann) + + modify description of xterm+x11hilite to eliminate unused p5 -TD + + add configure script checks to help with a port to Ultrix 3.1 + (report by Dennis Grevenstein). + + check if "b" binary feature of fopen works + + check for missing feature of locale.h + + add fallback for strstr() in test-programs + + add fallback for STDOUT_FILENO in test-programs + + update config.guess, config.sub + ------------------------------------------------------------------- Mon Mar 25 11:15:44 UTC 2019 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index 268fe3d..0efb4ce 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -598,7 +598,14 @@ mv tack-* tack mkdir pc PKG_CONFIG_PATH=$PWD/pc:$(pkg-config --variable pc_path pkg-config) export PKG_CONFIG_PATH - mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ + rm -vf %{root}%{_libdir}/pkgconfig/tic.pc + rm -vf %{root}%{_libdir}/pkgconfig/tinfo.pc + mv -vf %{root}%{_libdir}/pkgconfig/*.pc pc/ + sed -ri 's@^(Requires.private: ).*@\1panelw, menuw, formw, ncursesw, tinfo@' \ + pc/ncurses++w.pc + sed -ri 's@^(Requires.private: ).*@\1ncursesw, tinfo@' pc/{form,menu,panel}w.pc + sed -ri 's@^(Libs.private: .*)@\1 -lncursesw -ltinfo -ldl@' pc/{form,menu,panel}w.pc + sh %{S:6} --cflags "$(pkg-config --cflags ncursesw)" --libs "$(pkg-config --libs ncursesw)" \ %{root}%{_bindir}/ncursesw6-config # @@ -681,15 +688,17 @@ mv tack-* tack test -e "$pc" || break base=${pc%%.pc} base=${base##*/} - case "$base" in - tic) sed -ri 's@^(Requires.private: ).*@\1tinfo5@' "$pc" ;; - *) sed -ri 's@^(Requires.private: ).*@\1ncurses5@' "$pc" - esac sed -ri 's@^(includedir=).*@\1%{_incdir}/ncurses5/ncurses@' "$pc" sed -ri 's@^(libdir=).*@\1%{_libdir}/ncurses5@' "$pc" - sed -ri 's@^(Libs: )(.*)@\1-L${libdir}\2@' "$pc" mv -f $pc pc/${base}5.pc done + sed -ri 's@^(Requires.private: ).*@\1panel5, menu5, form5, ncurses5, tinfo5@' \ + pc/ncurses++5.pc + sed -ri 's@^(Requires.private: ).*@\1ncurses5, tinfo5@' pc/{form,menu,panel}5.pc + sed -ri 's@^(Libs.private: .*)@\1 -lncurses -ltinfo -ldl@' pc/{form,menu,panel}5.pc + sed -ri 's@^(Requires.private: ).*@\1tinfo5@' pc/tic5.pc + sed -ri 's@^(Libs.private: .*)@\1 -ltinfo@' pc/tic5.pc + sh %{S:6} --cflags "$(pkg-config --cflags ncurses5)" --libs "$(pkg-config --libs ncurses5)" \ %{root}%{_bindir}/ncurses5-config @@ -739,6 +748,13 @@ mv tack-* tack sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1 popd mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ + sed -ri 's@^(Requires.private: ).*@\1panel, menu, form, ncurses, tinfo@' \ + pc/ncurses++.pc + sed -ri 's@^(Requires.private: ).*@\1ncurses, tinfo@' pc/{form,menu,panel}.pc + sed -ri 's@^(Libs.private: .*)@\1 -lncurses -ltinfo -ldl@' pc/{form,menu,panel}.pc + sed -ri 's@^(Requires.private: ).*@\1tinfo@' pc/tic.pc + sed -ri 's@^(Libs.private: .*)@\1 -ltinfo@' pc/tic.pc + sh %{S:6} --cflags "$(pkg-config --cflags ncurses)" --libs "$(pkg-config --libs ncurses)" \ %{root}%{_bindir}/ncurses6-config # @@ -810,20 +826,23 @@ mv tack-* tack pushd man sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1 popd + rm -vf %{root}%{_libdir}/pkgconfig/tic.pc + rm -vf %{root}%{_libdir}/pkgconfig/tinfo.pc for pc in %{root}%{_libdir}/pkgconfig/*.pc do test -e "$pc" || break base=${pc%%.pc} base=${base##*/} - case "$base" in - tic) sed -ri 's@^(Requires.private: ).*@\1tinfo5@' "$pc" ;; - *) sed -ri 's@^(Requires.private: ).*@\1ncurses5@' "$pc" - esac sed -ri 's@^(includedir=).*@\1%{_incdir}/ncurses5/ncursesw@' "$pc" sed -ri 's@^(libdir=).*@\1%{_libdir}/ncurses5@' "$pc" sed -ri 's@^(Libs: )(.*)@\1-L${libdir}\2@' "$pc" mv -f $pc pc/${base}5.pc done + sed -ri 's@^(Requires.private: ).*@\1panelw5, menuw5, formw5, ncursesw5, tinfo5@' \ + pc/ncurses++w5.pc + sed -ri 's@^(Requires.private: ).*@\1ncursesw5, tinfo5@' pc/{form,menu,panel}w5.pc + sed -ri 's@^(Libs.private: .*)@\1 -lncursesw -ltinfo -ldl@' pc/{form,menu,panel}w5.pc + sh %{S:6} --cflags "$(pkg-config --cflags ncursesw5)" --libs "$(pkg-config --libs ncursesw5)" \ %{root}%{_bindir}/ncursesw5-config