Date: Mon, 1 Mar 2021 14:50:28 +0000 From: Alexander Richardson <arichardson@freebsd.org> To: Baptiste Daroussin <bapt@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: ec74116ace52 - main - dialog: finish update to 1.3-20210117 Message-ID: <CA%2BZ_v8pVc2sf5nzY2TaMTB-jiMGrs5s0MyXKLyVFdFZu7Fw=Gw@mail.gmail.com> In-Reply-To: <202102260917.11Q9HUnx061198@gitrepo.freebsd.org> References: <202102260917.11Q9HUnx061198@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 26 Feb 2021 at 09:17, Baptiste Daroussin <bapt@freebsd.org> wrote: > > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ec74116ace52591cf121623e2010ae5efab5524a > > commit ec74116ace52591cf121623e2010ae5efab5524a > Author: Baptiste Daroussin <bapt@FreeBSD.org> > AuthorDate: 2021-02-26 09:13:13 +0000 > Commit: Baptiste Daroussin <bapt@FreeBSD.org> > CommitDate: 2021-02-26 09:17:19 +0000 > > dialog: finish update to 1.3-20210117 > > patch dialog.c which requires stddef for the usage of offsetof > catchup on the config header > --- > contrib/dialog/dialog.c | 1 + > gnu/lib/libdialog/Makefile | 2 +- > gnu/lib/libdialog/dlg_config.h | 15 ++++++++++++--- > 3 files changed, 14 insertions(+), 4 deletions(-) > > diff --git a/contrib/dialog/dialog.c b/contrib/dialog/dialog.c > index 510baeb97add..f59c9dc03c13 100644 > --- a/contrib/dialog/dialog.c > +++ b/contrib/dialog/dialog.c > @@ -26,6 +26,7 @@ > > #include <dialog.h> > > +#include <stddef.h> > #include <string.h> > #include <sys/types.h> > #include <sys/stat.h> > diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile > index e4f1b62121d9..8c6b84b64f90 100644 > --- a/gnu/lib/libdialog/Makefile > +++ b/gnu/lib/libdialog/Makefile > @@ -15,7 +15,7 @@ MAN= dialog.3 > > LIBADD= ncursesw m > > -CFLAGS+= -I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -DGCC_UNUSED=__unused > +CFLAGS+= -I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -Wno-macro-redefined This appears to have broken the GCC build: cc1: error: unrecognized command line option '-Wno-macro-redefined' [-Werror] Probably fixable by using CFLAGS.clang? Thanks, Alex > .PATH: ${DIALOG} > WARNS?= 1 > > diff --git a/gnu/lib/libdialog/dlg_config.h b/gnu/lib/libdialog/dlg_config.h > index ee1d3f9ad3cb..1bd45183f509 100644 > --- a/gnu/lib/libdialog/dlg_config.h > +++ b/gnu/lib/libdialog/dlg_config.h > @@ -6,8 +6,15 @@ > */ > > #define CURSES_WACS_ARRAY _nc_wacs > -#define DIALOG_PATCHDATE 20180621 > +#define CURSES_WACS_SYMBOLS 1 > +#define DIALOG_PATCHDATE 20210117 > #define DIALOG_VERSION "1.3" > +#define GCC_NORETURN __attribute__((noreturn)) > +#define GCC_PRINTF 1 > +#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var))) > +#define GCC_SCANF 1 > +#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var))) > +#define GCC_UNUSED __attribute__((unused)) > #define HAVE_ALLOCA 1 > #define HAVE_BTOWC 1 > #define HAVE_COLOR 1 > @@ -58,6 +65,7 @@ > #define HAVE_NL_TYPES_H 1 > #define HAVE_PUTENV 1 > #define HAVE_RC_FILE 1 > +#define HAVE_RC_FILE2 1 > #define HAVE_SEARCH_H 1 > #define HAVE_SETENV 1 > #define HAVE_SETLOCALE 1 > @@ -93,11 +101,11 @@ > #define HAVE_WCTOMB 1 > #define HAVE_WCURSYNCUP 1 > #define HAVE_WGETPARENT 1 > +#define HAVE_WGET_WCH 1 > #define HAVE_WHIPTAIL 1 > #define HAVE_WSYNCUP 1 > #define HAVE_XDIALOG 1 > #define HAVE_XDIALOG2 1 > -#define HAVE__NC_FREE_AND_EXIT 1 > #define ICONV_CONST > #define MIXEDCASE_FILENAMES 1 > #define NCURSES 1 > @@ -105,7 +113,8 @@ > #define PACKAGE "dialog" > #define RETSIGTYPE void > #define STDC_HEADERS 1 > -#define SYSTEM_NAME "freebsd12.0" > +#define SYSTEM_NAME "FreeBSD" > #define TIME_WITH_SYS_TIME 1 > #define TYPE_CHTYPE_IS_SCALAR 1 > #define USE_WIDE_CURSES 1 > +#define WIDEC_CURSES 1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CA%2BZ_v8pVc2sf5nzY2TaMTB-jiMGrs5s0MyXKLyVFdFZu7Fw=Gw>