Skip to content

emacs/emacs-mac: Fix tree-sitter build issue #32095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amake merged 3 commits into from
Apr 7, 2026
+17 −9
Merged

emacs/emacs-mac: Fix tree-sitter build issue #32095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df01795
emacs/emacs-mac: Fix tree-sitter build issue
shuxiao9058 Apr 7, 2026
b602808
emacs{-app,}-devel: update to 20260406
amake Apr 7, 2026
b468c9b
emacs-mac-app{,-devel}: comment about tree-sitter flag
amake Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions aqua/emacs-mac-app/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ bitbucket.setup mituharu emacs-mac emacs-${emacs_version}-mac-${emacs_mac_ve
name emacs-mac-app
conflicts emacs-app emacs-app-devel
version ${emacs_mac_ver}
revision 3
revision 4
categories aqua editors
maintainers {amake @amake} openmaintainer

Expand Down Expand Up @@ -102,7 +102,7 @@ subport ${name}-devel {
set date 2025-09-20

version [string map {- {}} ${date}]
revision 1
revision 2

long_description \
${name} is the \"Mac port\" of GNU Emacs ${emacs_version}. \
Expand Down Expand Up @@ -177,6 +177,9 @@ variant treesitter description {Builds emacs with tree-sitter support} {
configure.args-append --with-tree-sitter
depends_lib-append port:tree-sitter

# TODO: This will become unnecessary in Emacs 31
configure.cflags-append -Dts_language_version=ts_language_abi_version

lappend rpaths ${prefix}/lib

depends_run-append \
Expand Down
19 changes: 12 additions & 7 deletions editors/emacs/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4

Check warning on line 1 in editors/emacs/Portfile

View workflow job for this annotation

GitHub Actions / macos-15 

port lint emacs-devel:
Warning: Variant x11 overrides global description

Check warning on line 1 in editors/emacs/Portfile

View workflow job for this annotation

GitHub Actions / macos-15 

port lint emacs:
Warning: Variant x11 overrides global description

Check warning on line 1 in editors/emacs/Portfile

View workflow job for this annotation

GitHub Actions / macos-26 

port lint emacs-devel:
Warning: Variant x11 overrides global description

Check warning on line 1 in editors/emacs/Portfile

View workflow job for this annotation

GitHub Actions / macos-26 

port lint emacs:
Warning: Variant x11 overrides global description

Check warning on line 1 in editors/emacs/Portfile

View workflow job for this annotation

GitHub Actions / macos-14 

port lint emacs-devel:
Warning: Variant x11 overrides global description

Check warning on line 1 in editors/emacs/Portfile

View workflow job for this annotation

GitHub Actions / macos-14 

port lint emacs:
Warning: Variant x11 overrides global description

PortSystem 1.0
PortGroup active_variants 1.1
Expand Down Expand Up @@ -124,7 +124,7 @@

if {$subport eq $name || $subport eq "emacs-app"} {
version 30.2
revision 3
revision 4
checksums rmd160 fefdd3fcd453d733114f609a3e122b2529cc7410 \
sha256 1d79a4ba4d6596f302a7146843fe59cf5caec798190bcc07c907e7ba244b076d \
size 83059014
Expand All @@ -137,17 +137,17 @@

# do not forget to check that configure hasn't introduce some suprises via
# git diff [old]..[new] -- '**/configure.ac'
github.setup emacs-mirror emacs db3d6f06c389e06922964fb4869d19ba9040c16e
github.setup emacs-mirror emacs 7ce60be53e7ffbc1972dd8e98744adf6103eee9e
github.tarball_from archive
epoch 5
version 20250924
revision 1
version 20260406
revision 0

master_sites ${github.master_sites}

checksums rmd160 591d36fc54fc696d35e026f6d8a80d0230ed1394 \
sha256 664d4fa8443c884ecbbddebfc799f9142dada9911eaff7b0fb116a4b0c63c2fe \
size 52379510
checksums rmd160 6496eb0f56b2250840049c249dea73310feb9244 \
sha256 4dc00f6615292c0d6fccd330260bf2b06abbe84d4a27c469be8a914c0faa1ed5 \
size 53052187

livecheck.type none

Expand Down Expand Up @@ -309,6 +309,11 @@
configure.args-append --with-tree-sitter
depends_lib-append port:tree-sitter

# TODO: This will become unnecessary in Emacs 31
if {$subport eq $name || $subport eq "emacs-app"} {
configure.cflags-append -Dts_language_version=ts_language_abi_version
}

if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
lappend rpaths ${prefix}/lib
}
Expand Down
⚡