<pre style='margin:0'>
Aaron Madlon-Kay (amake) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a9bdbc63ea40469031a9435baa94063897927ff1">https://github.com/macports/macports-ports/commit/a9bdbc63ea40469031a9435baa94063897927ff1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a9bdbc63ea4 emacs-mac-app-devel: update to 20230801
</span>a9bdbc63ea4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a9bdbc63ea40469031a9435baa94063897927ff1
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Wed Aug 2 09:47:45 2023 +0900
<span style='display:block; white-space:pre;color:#404040;'> emacs-mac-app-devel: update to 20230801
</span>---
aqua/emacs-mac-app/Portfile | 49 +++++++++++++++++++++++++++++++---
aqua/emacs-mac-app/files/site-start.el | 4 +++
2 files changed, 49 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/Portfile b/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 76142e0891c..9c32c664932 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +73,8 @@ configure.args --disable-silent-rules \
</span> --with-json \
--with-lcms2 \
--with-modules \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-webp
</span>
platform darwin {
configure.cflags-append -fobjc-arc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,8 +85,8 @@ if {${os.major} <= 13} {
</span> }
subport ${name}-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set emacs_version 28.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set date 2022-09-12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set emacs_version 29.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set date 2023-08-01
</span>
version [string map {- {}} ${date}]
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,7 +97,7 @@ subport ${name}-devel {
</span>
fetch.type git
git.url --shallow-since=${date}T00:00:00 --branch work https://bitbucket.org/mituharu/emacs-mac.git
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch 6e6d2e0c27b3f8a7a9bc54448c7ccb56cb8c66a4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch eb887b91b8aca00ba894db136ac22a0a91c8c5c1
</span>
# --shallow-since needs a newer version of git than on some older systems,
# so use MacPorts version
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,6 +106,39 @@ subport ${name}-devel {
</span>
conflicts emacs-mac-app
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --without-tree-sitter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:webp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant treesitter description {Builds emacs with tree-sitter support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-tree-sitter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-tree-sitter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tree-sitter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-typescript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-javascript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-tsx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-java \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-json \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-c-sharp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-bash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-dockerfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-toml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-go \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-go-mod \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-rust \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tree-sitter-ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +treesitter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.version ${git.branch}
bitbucket.livecheck work
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,7 +184,13 @@ variant nativecomp description {Builds emacs with native compilation support} {
</span> compiler.cpath-prepend ${prefix}/include/gcc${gcc_v}
compiler.library_path-prepend ${prefix}/lib/gcc${gcc_v}
configure.ldflags-append "-Wl,-rpath ${prefix}/lib/gcc${gcc_v}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append NATIVE_FULL_AOT=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subport eq ${name}-devel} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --with-native-compilation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-native-compilation=aot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append NATIVE_FULL_AOT=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant metal description {Enable experimental Metal support} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/files/site-start.el b/aqua/emacs-mac-app/files/site-start.el
</span><span style='display:block; white-space:pre;color:#808080;'>index 6138a9d495d..2b02e6611bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-mac-app/files/site-start.el
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/emacs-mac-app/files/site-start.el
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,3 +10,7 @@
</span>
;; Info-directory-list contains ${prefix}/share/info. See #32148.
(setq Info-default-directory-list (cons "__PREFIX__/share/info" Info-default-directory-list))
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+;; Look in MacPorts ${prefix} for tree-sitter parser libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(when (boundp 'treesit-extra-load-path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (setq treesit-extra-load-path (cons "__PREFIX__/lib" treesit-extra-load-path)))
</span></pre><pre style='margin:0'>
</pre>