From owner-dev-commits-src-all@freebsd.org Fri Feb 26 09:17:30 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C894555B3CA; Fri, 26 Feb 2021 09:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dn3vt5Ld7z3HWb; Fri, 26 Feb 2021 09:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AA80F32; Fri, 26 Feb 2021 09:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 11Q9HU02061199; Fri, 26 Feb 2021 09:17:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11Q9HUnx061198; Fri, 26 Feb 2021 09:17:30 GMT (envelope-from git) Date: Fri, 26 Feb 2021 09:17:30 GMT Message-Id: <202102260917.11Q9HUnx061198@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: ec74116ace52 - main - dialog: finish update to 1.3-20210117 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec74116ace52591cf121623e2010ae5efab5524a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Feb 2021 09:17:30 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ec74116ace52591cf121623e2010ae5efab5524a commit ec74116ace52591cf121623e2010ae5efab5524a Author: Baptiste Daroussin AuthorDate: 2021-02-26 09:13:13 +0000 Commit: Baptiste Daroussin 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 +#include #include #include #include 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