From nobody Wed Oct 23 20:41:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XYgv86Kwdz5Zfqq; Wed, 23 Oct 2024 20:41:40 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYgv85f65z4TFN; Wed, 23 Oct 2024 20:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729716100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBFUsaNzsLv28pE6KS8DkX4U0eSdxu3DwuoQbcLb91I=; b=VCZ0MlUGOpGR60ymnQqkuc+adPQVKpw9Eb+kasmsph6jonoASfVXWM0bdqapAxDoZIA7pu X2iFUkNJeO4UMyiqF5ZF2PJ7w6QrMgcoDPZL5uGdWKFVo68I2yRdIVMbtRuv2luthNG7pC LIwj9DAnAfVkBi38g5Q/ciUGMgLbAXmwbWn2HzMezGy6MbN7/nfA14XaF0lxuHU/OGEdkK Wb99WMj/yAMx0q4rjVk4xtkmJ3Bl6S9hbQ1yII0JcHY0w6Y2z7xg2cONUcC1Ber2RA+OiJ xFn1VllKhRhO9VJwDFvZwheTWsEurukMbrIscxRObO/QNKL5ZkMUwzU00If3ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729716100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBFUsaNzsLv28pE6KS8DkX4U0eSdxu3DwuoQbcLb91I=; b=ih85JkgaDe+Ul832c+JqJV1HhZfQidCin6F/PQzOnfaqEbCe9X+u3aVMg+BWTk8Iu2UrFv NqwBCSVQoMcMqNcB2Vrk9FbAUPvupla3A0EUg4AOfkBaxClUrq385PDcyumeq569OQtYJ0 cS+cpi7gT/yzEIZbMwUPKOJP7FClCmuPsrdiWkLTR4duKYAsRZ8HHIHqwPs6oHeQR8/1QG 1+Vyttlwf0z/uPlqAowkZ2ebv+sgCJCgpwCTZkA+Jk+VSDErFXqfyQvJJlftQ6NF1AiLCk p7GQFeJJAbkP0RVlwTWTItzJF4FGjJd8MUZ7rx/HlDSIgMpdP9y3X25o4c9paw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729716100; a=rsa-sha256; cv=none; b=gKdNT5SjPNQhECS2Ql7gPtUhyESUjFKHk9zSDx8KU6LmVz6bJxHw+C4Qna48pPzEqHsTrT XKBGJ5lRQSFs+KFOS3OZtXfQQb+MunDBFLNiJlUpL4sgcBKqnIjHf4JixuwVChk3oB8g7V 0Xp+fZFHF29aYkR5YxEV5M581pz4mefTWFgGWh1bK9tK9FUmKWgPXGr+gsFvcBfst7lWqg sAKdmPf+fu+Pw6AWwOQrbwtoAs08IlE6L30uJdPPPCSTwjoTrhw8S9Hmhr/+7ezHqD14I1 TKtBEQc79UQLiRmc4f7PexvCrbtK91V3LYI66TZ4JuxHnMd17HKvwyXe7m2CiQ== 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 4XYgv85FSJz1CkY; Wed, 23 Oct 2024 20:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NKfeBw014567; Wed, 23 Oct 2024 20:41:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NKfemF014564; Wed, 23 Oct 2024 20:41:40 GMT (envelope-from git) Date: Wed, 23 Oct 2024 20:41:40 GMT Message-Id: <202410232041.49NKfemF014564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 514f4e89acd2 - main - ncurses: Fix codegen for key names and codes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 514f4e89acd2e7b1824b261055bef49a3da6a956 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=514f4e89acd2e7b1824b261055bef49a3da6a956 commit 514f4e89acd2e7b1824b261055bef49a3da6a956 Author: SHENG-YI HONG AuthorDate: 2024-10-23 20:38:33 +0000 Commit: Li-Wen Hsu CommitDate: 2024-10-23 20:39:36 +0000 ncurses: Fix codegen for key names and codes Adding back arguments, which were missed during the import of ncurses version 6.5, to the code gen awk script. This is modified from lib_keyname.c and keys.list targets in contrib/ncurses/ncurses/Makefile.in of 21817992b3314c908ab50f0bb88d2ee750b9c4ac PR: 280697 Reported by: np Reviewed by: bapt Tested by: scf Fixes: 21817992b331 ncurses: vendor import version 6.5 MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47153 --- lib/ncurses/tinfo/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile index 55b24cd3bc97..ea06e7bec03f 100644 --- a/lib/ncurses/tinfo/Makefile +++ b/lib/ncurses/tinfo/Makefile @@ -230,7 +230,8 @@ codes.c: MKcodes.awk ${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKcodes.awk bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > codes.c lib_keyname.c: keys.list MKkeyname.awk - ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKkeyname.awk bigstrings=${USE_BIG_STRINGS} keys.list > lib_keyname.c + ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKkeyname.awk use_sigwinch=${ENABLE_SIGWINCH} \ + bigstrings=${USE_BIG_STRINGS} keys.list > lib_keyname.c unctrl.c: MKunctrl.awk echo | ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKunctrl.awk bigstrings=${USE_BIG_STRINGS} > unctrl.c @@ -278,7 +279,7 @@ curses.h: curses.head MKkey_defs.sh Caps Caps-ncurses # Generated intermediate files keys.list: MKkeys_list.sh Caps Caps-ncurses - AWK=${AWK} sh ${NCURSES_DIR}/ncurses/tinfo/MKkeys_list.sh \ + AWK=${AWK} USE_SIGWINCH=${ENABLE_SIGWINCH} sh ${NCURSES_DIR}/ncurses/tinfo/MKkeys_list.sh \ ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses | LC_ALL=C sort > keys.list .if ${MK_DIRDEPS_BUILD} == "yes" && ${MACHINE} != "host"