From owner-dev-commits-src-all@freebsd.org Mon Mar 1 14:50:43 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 2262955FDC5; Mon, 1 Mar 2021 14:50:43 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dq38y31bFz4dpt; Mon, 1 Mar 2021 14:50:42 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: by mail-ed1-f46.google.com with SMTP id w9so4950988edt.13; Mon, 01 Mar 2021 06:50:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=AgZVFNTgcwSBTnqXfA5mRPbtXNUHYv1wpNtw0MjAoy0=; b=cCuPp5aIulsF0iUTwdNFFDBO3DBan6B3rSZlSt/eD6jY8vpsFuLh5/oXyPrTY67uW5 +fB5Ud4tkvNzW9pQbYlmEUUG+Ej32vGZhGwvSxfdsEgbrLIqoGqxzjLqXK8+wck+q2TD f2tElxVqF6ZXOPJGRD83Km5P5+UwbUoJlj69utcKRO9mnZ7wR3L+Vr9afa2N1p1WJnQv citFijvVEXscYTQS1ydE8lCPyS+CHsSp8P53wnXywt+Uu7ySSAkvrxxU5GA3vXMLHWoa rmDm/fXasb+MhXWbHtkYCWvTZI0iDAy94+LpPMzermnwfunu6GEeImMMU2d/eqUZkNNb tw6w== X-Gm-Message-State: AOAM532w++3qgl4C2AomhvPDTuuUzOtQ+HgmMJ18k43AqUg9sLNAOD9y GwexnHeD05dHgPkAW7Pw88SBj013751WRg== X-Google-Smtp-Source: ABdhPJx4JdxcWuCcXZcZnXh6Qf0RFA2gLQ87GRDq5FoGbcxHzTuDSkqdNVcSmIhD89ogTM4e2dmvPA== X-Received: by 2002:aa7:cd8d:: with SMTP id x13mr16457611edv.286.1614610240380; Mon, 01 Mar 2021 06:50:40 -0800 (PST) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com. [209.85.128.52]) by smtp.gmail.com with ESMTPSA id v24sm4798433ejw.17.2021.03.01.06.50.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 01 Mar 2021 06:50:40 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id i9so13442402wml.0; Mon, 01 Mar 2021 06:50:40 -0800 (PST) X-Received: by 2002:a7b:c119:: with SMTP id w25mr15878706wmi.127.1614610239791; Mon, 01 Mar 2021 06:50:39 -0800 (PST) MIME-Version: 1.0 References: <202102260917.11Q9HUnx061198@gitrepo.freebsd.org> In-Reply-To: <202102260917.11Q9HUnx061198@gitrepo.freebsd.org> From: Alexander Richardson Date: Mon, 1 Mar 2021 14:50:28 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: ec74116ace52 - main - dialog: finish update to 1.3-20210117 To: Baptiste Daroussin Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Dq38y31bFz4dpt X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of arichardsonkde@gmail.com designates 209.85.208.46 as permitted sender) smtp.mailfrom=arichardsonkde@gmail.com X-Spamd-Result: default: False [-2.71 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM_SHORT(-0.71)[-0.707]; FORGED_SENDER(0.30)[arichardson@freebsd.org,arichardsonkde@gmail.com]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[arichardson@freebsd.org,arichardsonkde@gmail.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TAGGED_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.208.46:from]; SPAMHAUS_ZRD(0.00)[209.85.208.46:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.46:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.46:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-src-all,dev-commits-src-main] 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: Mon, 01 Mar 2021 14:50:43 -0000 On Fri, 26 Feb 2021 at 09:17, Baptiste Daroussin wrote: > > 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 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