Accepting request 688199 from Base:System

- Add ncurses patch 20190323
  + move macro for is_linetouched() inside NCURSES_NOMACROS ifndef.
  + corrected prototypes in several manpages using script to extract
    those in compilable form.
  + use _nc_copy_termtype2() rather than direct assignment in setupterm,
    in case it is called repeatedly using fallback terminfo descriptions
    (report/patch by Werner Fink).
- Drop patch ncurses-6.1-fallback.dif as now upstream

- Reintroduce patch ncurses-6.1-fallback.dif to fix boo#1130091 

- Add ncurses patch 20190317
  + regenerate llib-* files.
  + modify tic to also use new function for user-defined capability info.
  + modify _nc_parse_entry() to check if a user-defined capability has
    an unexpected type; ignore it in that case.
  + fix a special case of link-anchors in generated Ada html files.
  + use newer rel=author tag in generated html rather than rev=made,
    which did not become accepted.

- Add ncurses patch 20190309
  + in-progress changes to add parameter-checking for common user-defined
    capabilities in tic.
  + update MKcodes.awk and MKnames.awk to ignore the new "userdef"
    data in Caps-ncurses (cf: 20190302).

- Add ncurses patch 20190223
  + fix typo in adds200 -TD
  + add tic check for consistent alternate character set capabilities.
  + improve check in mvcur() to decide whether to use hard-tabs, using

OBS-URL: https://build.opensuse.org/request/show/688199
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ncurses?expand=0&rev=154

ncurses-6.1-patches.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eef95a9bedd2beadf0adb4b9a5260600b21f9c5c078ea699b1cffb51163730fa
+oid sha256:ebc5f17257e154cd75855ed3220643fe8435a4ce0d6aeed29958c62fe11e866a
-size 1303656
+size 1420839

ncurses-6.1.dif

@@ -311,7 +311,7 @@
  #undef  NCURSES_OSPEED 
 --- include/tic.h
 +++ include/tic.h	2019-02-06 07:51:48.445355328 +0000
-@@ -221,12 +221,12 @@ struct alias
+@@ -236,12 +236,12 @@ struct alias
   */
  
  /* out-of-band values for representing absent capabilities */
@@ -784,7 +784,7 @@
  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
-@@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) :
+@@ -221,7 +221,7 @@ $(DESTDIR)$(libdir) :
  ../lib : ; mkdir $@
  
  ./fallback.c : $(tinfo)/MKfallback.sh
@@ -795,7 +795,7 @@
  	$(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
-@@ -2205,6 +2205,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
+@@ -2224,6 +2224,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);
@@ -915,7 +915,7 @@
  
 +    _nc_fsid();
      if (_nc_access(filename, R_OK) < 0
- 	|| (fp = fopen(filename, "rb")) == 0) {
+ 	|| (fp = fopen(filename, BIN_R)) == 0) {
  	TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno));
 @@ -571,6 +572,7 @@ _nc_read_file_entry(const char *const fi
  	}
@@ -994,7 +994,7 @@
  
 --- test/test.priv.h
 +++ test/test.priv.h	2019-02-06 07:51:48.457355102 +0000
-@@ -940,12 +940,12 @@ extern char *strnames[], *strcodes[], *s
+@@ -944,12 +944,12 @@ extern char *strnames[], *strcodes[], *s
  #endif
  
  /* out-of-band values for representing absent capabilities */

ncurses.changes

@@ -1,3 +1,52 @@
+-------------------------------------------------------------------
+Mon Mar 25 11:15:44 UTC 2019 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20190323
+  + move macro for is_linetouched() inside NCURSES_NOMACROS ifndef.
+  + corrected prototypes in several manpages using script to extract
+    those in compilable form.
+  + use _nc_copy_termtype2() rather than direct assignment in setupterm,
+    in case it is called repeatedly using fallback terminfo descriptions
+    (report/patch by Werner Fink).
+- Drop patch ncurses-6.1-fallback.dif as now upstream
+
+-------------------------------------------------------------------
+Fri Mar 22 08:59:22 UTC 2019 - Dr. Werner Fink <werner@suse.de>
+
+- Reintroduce patch ncurses-6.1-fallback.dif to fix boo#1130091 
+
+-------------------------------------------------------------------
+Tue Mar 19 09:16:38 UTC 2019 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20190317
+  + regenerate llib-* files.
+  + modify tic to also use new function for user-defined capability info.
+  + modify _nc_parse_entry() to check if a user-defined capability has
+    an unexpected type; ignore it in that case.
+  + fix a special case of link-anchors in generated Ada html files.
+  + use newer rel=author tag in generated html rather than rev=made,
+    which did not become accepted.
+
+-------------------------------------------------------------------
+Mon Mar 11 08:19:08 UTC 2019 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20190309
+  + in-progress changes to add parameter-checking for common user-defined
+    capabilities in tic.
+  + update MKcodes.awk and MKnames.awk to ignore the new "userdef"
+    data in Caps-ncurses (cf: 20190302).
+
+-------------------------------------------------------------------
+Mon Feb 25 08:18:08 UTC 2019 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20190223
+  + fix typo in adds200 -TD
+  + add tic check for consistent alternate character set capabilities.
+  + improve check in mvcur() to decide whether to use hard-tabs, using
+    xt, tbc and hts as clues.
+  + replace check in reset command for obsolete "pt" capability using
+    tbc and hts capabilities as clues (report by Nicolas Marriott).
+
 -------------------------------------------------------------------
 Mon Feb 18 08:56:21 UTC 2019 - Dr. Werner Fink <werner@suse.de>
 

ncurses.spec

@@ -74,7 +74,7 @@ Source6:        edit.sed
 Source7:        baselibs.conf
 Patch0:         ncurses-6.1.dif
 Patch1:         ncurses-5.9-ibm327x.dif
-Patch4:         ncurses-5.7-tack.dif
+Patch2:         ncurses-5.7-tack.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _miscdir    %{_datadir}/misc
 %global         _incdir     %{_includedir}
@@ -310,7 +310,7 @@ rm -fr tack
 tar -xzf %{S:5}
 mv tack-* tack
 %patch1 -p0 -b .327x
-%patch4 -p0 -b .hs
+%patch2 -p0 -b .hs
 %patch0 -p0 -b .p0
 
 %build