Skip to content

Commit 7cdf9f5

Browse files
authored
emacs/emacs-mac: Fix tree-sitter build issue (#32095)
* emacs/emacs-mac: Fix tree-sitter build issue * emacs{-app,}-devel: update to 20260406 * emacs-mac-app{,-devel}: comment about tree-sitter flag --------- Co-authored-by: Aaron Madlon-Kay <aaron@madlon-kay.com> Fixes https://trac.macports.org/ticket/73805
1 parent 8a17622 commit 7cdf9f5

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

aqua/emacs-mac-app/Portfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ bitbucket.setup mituharu emacs-mac emacs-${emacs_version}-mac-${emacs_mac_ve
1010
name emacs-mac-app
1111
conflicts emacs-app emacs-app-devel
1212
version ${emacs_mac_ver}
13-
revision 3
13+
revision 4
1414
categories aqua editors
1515
maintainers {amake @amake} openmaintainer
1616

@@ -102,7 +102,7 @@ subport ${name}-devel {
102102
set date 2025-09-20
103103

104104
version [string map {- {}} ${date}]
105-
revision 1
105+
revision 2
106106

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

180+
# TODO: This will become unnecessary in Emacs 31
181+
configure.cflags-append -Dts_language_version=ts_language_abi_version
182+
180183
lappend rpaths ${prefix}/lib
181184

182185
depends_run-append \

editors/emacs/Portfile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ platform darwin {
124124

125125
if {$subport eq $name || $subport eq "emacs-app"} {
126126
version 30.2
127-
revision 3
127+
revision 4
128128
checksums rmd160 fefdd3fcd453d733114f609a3e122b2529cc7410 \
129129
sha256 1d79a4ba4d6596f302a7146843fe59cf5caec798190bcc07c907e7ba244b076d \
130130
size 83059014
@@ -137,17 +137,17 @@ if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
137137

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

146146
master_sites ${github.master_sites}
147147

148-
checksums rmd160 591d36fc54fc696d35e026f6d8a80d0230ed1394 \
149-
sha256 664d4fa8443c884ecbbddebfc799f9142dada9911eaff7b0fb116a4b0c63c2fe \
150-
size 52379510
148+
checksums rmd160 6496eb0f56b2250840049c249dea73310feb9244 \
149+
sha256 4dc00f6615292c0d6fccd330260bf2b06abbe84d4a27c469be8a914c0faa1ed5 \
150+
size 53052187
151151

152152
livecheck.type none
153153

@@ -309,6 +309,11 @@ variant treesitter description {Builds emacs with tree-sitter support} {
309309
configure.args-append --with-tree-sitter
310310
depends_lib-append port:tree-sitter
311311

312+
# TODO: This will become unnecessary in Emacs 31
313+
if {$subport eq $name || $subport eq "emacs-app"} {
314+
configure.cflags-append -Dts_language_version=ts_language_abi_version
315+
}
316+
312317
if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
313318
lappend rpaths ${prefix}/lib
314319
}

0 commit comments

Comments
 (0)