From nobody Mon Mar 30 18:08:55 2026 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 4fkzlX0F3Wz6XBT5 for ; Mon, 30 Mar 2026 18:08:56 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fkzlW6k6Nz3p06 for ; Mon, 30 Mar 2026 18:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774894136; 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=+ncwQWlLbEaFHKaUPAdD+EmWuNc8NN87eE/JDSZgs1g=; b=IbNK43PKbUQoXNtG466VzzZid+jEUX9Dl+nKnyiMZIMemBL5qL95eY/lsa9AwCjr+bgx1g 0vWRMwdnCMejzfsF05JJZQhrVN+AnY0PoTGn7qQNc0brWvwynVU2sqAgn/mq+qorjpBlPV PrBORui8MMeedk5gkZNhsv00OP7yx6ifeD/4IvRN9AAfo8gArSgPsYgNJeh+lITTLSfoWG QYCs9YM4Oh2icBnCytxqTZafl+7A5kqMErh/DYHDbibVLrgXdnpOOlZTHSlYL65Oe+7KPX +LTjpw/OQmFFg2RtKA8liqLS8Me2sh2XOBAcpFjojlbjuQJ9i8Dx4X8G7JdscA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774894136; a=rsa-sha256; cv=none; b=PRwhcP1K0Yquf4+7yTo3w2VOr5eB9vwYKfuZuWjtcgoYsBeSjF5sHTLeuBUTsTPl0uyoXg uTF3qqb5xpE02m5HptHznv74CBVMDPQCJUrYE3gbYjPuzRvwxdB2f4oEs8kmIVnO9kBYbM bWBe0cOTzh204Q//svBIuULDES6nE7593wuX8ge0J46rSsTwNVmLb/AhapnQsD+ZPrEIyx 4VByDL/Sh6kD11ndqi9roRb5jwdqJI71FJ1PSJl61O3b6z0NbiPE5rqsq7GNmuIdFHq/pR K+ihOdij1ORbWqbUUOwuqNDbdmPviRMESJ3yBlp7GBrKDy2IstQB/DoPaDVSqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774894136; 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=+ncwQWlLbEaFHKaUPAdD+EmWuNc8NN87eE/JDSZgs1g=; b=Z9QQ3voXTG12ztco9rwvRQ6e5omeC21H53i16wYGgxneIuNxZ1rbvO2WcxJCiX1CMcoLuO zVhB7sdmFO6NXxRT3YAZzPOES195+o22aIC/4Vk1VipUF5COzZWz5BoMk4UXIe2KthEJEf GjbBvFBlrkUAM7M1Ch3x/XkQ5syeBXi7Q10hBSbWsZ38jBY0kYt1RuDn8zsMeykK1BtDNi xcM8jLpMvkoTnbKliu4uCRTMGk0A39QTXPIrm/W4RjTUzIVvW62UlxWrYeklQNYHT8QVIV G7xDhIIezeP0S9a2xftnErv9fJwYToU9abuNwPq9RgPEy79M/M8wO7tXyxDFkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fkzlW5hkQztVZ for ; Mon, 30 Mar 2026 18:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45555 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 30 Mar 2026 18:08:55 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 0c810e677ac6 - main - editors/emacs: Unbreak build after devel/tree-sitter update 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c810e677ac68d110f85a6fa9258e2c8147a9133 Auto-Submitted: auto-generated Date: Mon, 30 Mar 2026 18:08:55 +0000 Message-Id: <69cabc37.45555.23d0d317@gitrepo.freebsd.org> The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c810e677ac68d110f85a6fa9258e2c8147a9133 commit 0c810e677ac68d110f85a6fa9258e2c8147a9133 Author: Joseph Mingrone AuthorDate: 2026-03-30 17:54:30 +0000 Commit: Joseph Mingrone CommitDate: 2026-03-30 18:08:33 +0000 editors/emacs: Unbreak build after devel/tree-sitter update When devel/tree-sitter was updated from version 0.25.10 to 0.26.7 in 19fa3d59c58, editors/emacs failed to build due to a breaking ABI change introduced in tree-sitter 0.26. Fix the build by patching Emacs to call tree-sitter's new function, ts_language_abi_version, rather than the old ts_language_version. Both functions have the same signature. PR: 294144 Reported by: russo@bogodyn.org Sponsored by: The FreeBSD Foundation --- editors/emacs/Makefile | 2 +- editors/emacs/files/patch-src_treesit.c | 56 +++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index e0f0c0c89999..dbf9a1a64073 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,6 +1,6 @@ PORTNAME= emacs DISTVERSION= 30.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= GNU diff --git a/editors/emacs/files/patch-src_treesit.c b/editors/emacs/files/patch-src_treesit.c new file mode 100644 index 000000000000..f38b3910424e --- /dev/null +++ b/editors/emacs/files/patch-src_treesit.c @@ -0,0 +1,56 @@ +--- src/treesit.c.orig 2026-03-30 17:46:40 UTC ++++ src/treesit.c +@@ -34,7 +34,7 @@ along with GNU Emacs. If not, see