diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2021-02-26 09:13:13 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2021-02-26 09:17:19 +0000 |
commit | ec74116ace52591cf121623e2010ae5efab5524a (patch) | |
tree | c34c4f50feb3e5a8ccbdabbce5c7312d4dd7c9e6 | |
parent | a96ef4501919d7ac08e94e98dc34b0bdd744802b (diff) | |
download | src-ec74116ace52591cf121623e2010ae5efab5524a.tar.gz src-ec74116ace52591cf121623e2010ae5efab5524a.zip |
dialog: finish update to 1.3-20210117
patch dialog.c which requires stddef for the usage of offsetof
catchup on the config header
-rw-r--r-- | contrib/dialog/dialog.c | 1 | ||||
-rw-r--r-- | gnu/lib/libdialog/Makefile | 2 | ||||
-rw-r--r-- | 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 .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 |