From nobody Tue Mar 07 22:55:53 2023 X-Original-To: dev-commits-ports-main@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 4PWW560pStz3wlLm; Tue, 7 Mar 2023 22:55:54 +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 4PWW5602H7z46MP; Tue, 7 Mar 2023 22:55:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678229754; 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=nZgaxaREloctD+dlcpQuh3LYgDCrJMijmKgiEDON6pE=; b=aUS8EgGjveQuHzpaq3+5Bxe7UN7AqPQ/+mWEvbyIIfW5QAPLHjzXcqJW3JiBaED0+lwxs7 nnXF63tK0Py6o6bleNhjdqKEvJze5FPZtuJpvLbEc3FHt3j8Mzh1uvR74XCFsR7X9n1Oca pb/FcblDYIiGbOzqKzY6CLHW/n/HMu7vUvaWYQhdTiyf5FxtOekIqzFtQacGJk7XUVOX8S C8rxD4A/CDm6DdIfBI9tiRVBHxy3VG+qCTO6LiGUyMah0fUmRt7i5XajQDZHT7BLf79XGr GX1StJYvXFwRM8Wn54JRGa3ICjoKimf3zqx8IZ5itP/bXItD/HHG7YJECEPKrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678229754; 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=nZgaxaREloctD+dlcpQuh3LYgDCrJMijmKgiEDON6pE=; b=WwJyB2qHVVx4yiZUUty4FWfP7nbyzoYbv0cKGxVib76ipOcHr8twFuuZknxniGg8YFsh+V 4qcEwApC6ZanLdU7w9euyszO4KwztSIoctj6u62n/eVCOstfEjBOK4wzjEmwbqKbe18SSQ +AHv2JJ7pRjS+RBWdG+wpaMYsMwoaDjBg4s6w9H9E05auMVxkZuBa0iWYkNZXhAmLBY9jq kptWilrPlria1GxkrWMOXHZbUq6HmS+//ezOvZxvMCKOxaH7uMon3MQRV8G7aOnBTh/VS/ Izmw96B3V0JN8XYop8sP9jPTwQUCFoq191pS37j2gGgQ8uBpURoMiB4vXC8hoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678229754; a=rsa-sha256; cv=none; b=jt0v1XJdRf1zeGgmJVd0lC5NVlGF4w4+0vpezJquDzlaTRmjl0A4tqqUy5V9YZrZBIryO8 P388jqvGW+hjmSPtR2rAMmHTxB54mx33pY6wmqv71iTlyu1UEHeSktLRqciny17BaPxmLH hynAEE2a1j8Rqe9N7oitdJ3pgHTjmrUISxxZUPUjfNc8WOMkIvN3Z4XrfMJO7c2JNxi8rX cBHmMnsYwwVuVLRo+gKmjka/ZtfsagS/9zXgrlCqQOU5Uak8u2PglTkEmh4SwUAa2N3Wlp p+nqvmvqjU4HVgDRpMQW1Di0E0pSI1wO6oiZ9YWzkclD/kkfm/BU4b0nVqHW/Q== 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 4PWW5566p6z12P3; Tue, 7 Mar 2023 22:55:53 +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 327MtrPp014859; Tue, 7 Mar 2023 22:55:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327MtrBe014858; Tue, 7 Mar 2023 22:55:53 GMT (envelope-from git) Date: Tue, 7 Mar 2023 22:55:53 GMT Message-Id: <202303072255.327MtrBe014858@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Chris Rees Subject: git: 6befd3347c1c - main - textproc/atom: Fix build on head List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: crees X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6befd3347c1c883aacbc09ede82d311ddc3b8be9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by crees: URL: https://cgit.FreeBSD.org/ports/commit/?id=6befd3347c1c883aacbc09ede82d311ddc3b8be9 commit 6befd3347c1c883aacbc09ede82d311ddc3b8be9 Author: Chris Rees AuthorDate: 2023-03-07 22:54:41 +0000 Commit: Chris Rees CommitDate: 2023-03-07 22:55:35 +0000 textproc/atom: Fix build on head Reported by: pointyhat --- textproc/atom/files/patch-msg.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/textproc/atom/files/patch-msg.c b/textproc/atom/files/patch-msg.c new file mode 100644 index 000000000000..b03304be69a0 --- /dev/null +++ b/textproc/atom/files/patch-msg.c @@ -0,0 +1,14 @@ +--- msg.c.orig 2023-03-07 22:52:52 UTC ++++ msg.c +@@ -194,11 +194,7 @@ parse_preface(const char *template) { + fmt[p++] = *template; + if (state == percent) { + if (*template == 's') +-#if defined(_POSIX_SOURCE) + p += sprintf(fmt + p - 2, "%d", msg_severity) - 2; +-#else +- p = strchr(sprintf(fmt + p - 2, "%d", msg_severity), 0) - fmt; +-#endif + state = normal; + } else if (*template == '%') + state = percent;