Re: 20170715: Broken libtinfo again

[Dr. Werner Fink]

On Mon, Jul 17, 2017 at 04:22:02PM +0200, Sven Joachim wrote:
> Am 17.07.2017 um 14:58 schrieb Dr. Werner Fink:
> 
> > This change
> >
> > @@ -2168,6 +2168,8 @@
> >  #define _nc_export_termtype2(dst,src) /* nothing */
> >  #define _nc_import_termtype2(dst,src) /* nothing */
> >  #define _nc_free_termtype2(t) _nc_free_termtype(t)
> > +/* also... */
> > +#define _nc_read_entry2 _nc_read_entry
> >  #endif
> >  
> >  #if NO_LEAKS
> >
> > in ncurses/curses.priv.h does break libtinfo.
> 
> Actually libtinfo had been broken since the addition of _nc_read_entry2
> in the 20170415 patchlevel because _nc_read_entry was dropped from it
> (unless you configured with --enable-widec).  This broke tack which
> relies on that symbol, see https://bugs.debian.org/868328.
> 
> The current patchlevel backs out that change and restores compatibility
> with 20170408 and earlier, but breaks infocmp versions built from the
> 20170415-20170708 patchlevels.

I build with and without --enable-widec as well as ABI 5 and ABI 6
... and I see in the build environment for the first case (--disable-widec
and ABI 6)

[   46s] ../ncurses/./tinfo/read_entry.c:762:1: error: redefinition of 
'_nc_read_entry'
[   46s]  _nc_read_entry(const char *const name, char *const filename, TERMTYPE 
*const tp)
[   46s]  ^~~~~~~~~~~~~~
[   46s] In file included from ../ncurses/./tinfo/read_entry.c:39:0:
[   46s] ../ncurses/curses.priv.h:2174:25: note: previous definition of 
'_nc_read_entry' was here
[   46s]  #define _nc_read_entry2 _nc_read_entry
[   46s]                          ^
[   46s] ../ncurses/./tinfo/read_entry.c:718:1: note: in expansion of macro 
'_nc_read_entry2'
[   46s]  _nc_read_entry2(const char *const name, char *const filename, 
TERMTYPE2 *const tp)
[   46s]  ^~~~~~~~~~~~~~~

Beside that the define might look more like

  #define _nc_read_entry2(n,f,t) _nc_read_entry(n,f,t)

Werner

-- 
  "Having a smoking section in a restaurant is like having
          a peeing section in a swimming pool." -- Edward Burr

signature.asc
Description: PGP signature