<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/d0ed93fa45ed8560aee781cd9016ba9de213ba33">https://github.com/macports/macports-ports/commit/d0ed93fa45ed8560aee781cd9016ba9de213ba33</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 d0ed93fa45e emacs-mac-app{-devel}: update (#10450)
</span>d0ed93fa45e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d0ed93fa45ed8560aee781cd9016ba9de213ba33
</span>Author: Fred Fu <moonsolo@gmail.com>
AuthorDate: Sun Mar 28 20:41:09 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> emacs-mac-app{-devel}: update (#10450)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * emacs-mac-app : update to 8.2 (Emacs 27.2)
</span><span style='display:block; white-space:pre;color:#404040;'> * emacs-mac-app-devel: update to 20210327
</span><span style='display:block; white-space:pre;color:#404040;'> * The patch-apple-silicon.diff is no longer needed, since the latest
</span><span style='display:block; white-space:pre;color:#404040;'> emacs-mac has included the corresponding changes
</span>---
aqua/emacs-mac-app/Portfile | 18 +++++-----
aqua/emacs-mac-app/files/patch-apple-silicon.diff | 43 -----------------------
2 files changed, 8 insertions(+), 53 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 853e4689ef6..fc7692c48a1 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;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
PortGroup bitbucket 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set emacs_version 27.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set emacs_mac_ver 8.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set emacs_version 27.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set emacs_mac_ver 8.2
</span>
bitbucket.setup mituharu emacs-mac emacs-${emacs_version}-mac-${emacs_mac_ver}
name emacs-mac-app
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +21,9 @@ long_description ${name} is "Mac port" addition to GNU Emacs ${emacs_version}
</span> platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8c5f4110b4b541ab0b2117d79aa4d3249e70f33b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cae62f036be66ebcdada4d4563859b70825d2a8c91edd24e9e9794ece9f30dee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 43579411
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 290a7a598ca6d2a6d9be80d64049cc50da1e6d27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 80c7377c95591cd8034443a05d596a6e0440adfc6a2633ad143167fadac3d828 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 43668156
</span>
depends_lib port:ncurses \
port:libxml2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +38,6 @@ patchfiles patch-src_emacs.c.diff
</span> if {${subport} eq ${name}} {
conflicts emacs-mac-app-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-apple-silicon.diff
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,9 +70,9 @@ if {${os.major} >= 11 && ${os.platform} eq "darwin"} {
</span> }
subport ${name}-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set emacs_version 27.1.90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set emacs_version 27.2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20201223
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20210327
</span> revision 0
long_description \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +81,7 @@ subport ${name}-devel {
</span>
fetch.type git
git.url --depth=1000 --branch work https://bitbucket.org/mituharu/emacs-mac.git
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch 8b46c72a14cd2496486d1bb82a75c3e6e05c366b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch 686c6463ca0464a49e44efbf730c8256ccf8735c
</span>
conflicts emacs-mac-app
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/files/patch-apple-silicon.diff b/aqua/emacs-mac-app/files/patch-apple-silicon.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ccee35b244d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-mac-app/files/patch-apple-silicon.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bitbucket.org/mituharu/emacs-mac/commits/ef4507125fdad5c3f079dde555b61febde2d43f7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ef4507125fdad5c3f079dde555b61febde2d43f7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Itai Seggev <is+apple@cs.hmc.edu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 24 Nov 2020 06:52:27 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Codesign the executable on recene MacOS systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* src/Makefile.in (temacs$(EXEEXT)): Codesign the executable on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-recent (ARM) MacOS systems (bug#43878). Without this, building
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Emacs fails.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Copyright-paperwork-exempt: yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/Makefile.in | 7 +++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 7 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/Makefile.in b/src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 533b4e8..58a7f22 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -344,6 +344,10 @@ DUMPING=@DUMPING@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CHECK_STRUCTS = @CHECK_STRUCTS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_PDUMPER = @HAVE_PDUMPER@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## ARM Macs require that all code have a valid signature. Since pump
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+## invalidates the signature, we must re-sign to fix it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DO_CODESIGN=$(patsubst aarch64-apple-darwin%,yes,@configuration@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 'make' verbosity.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -660,6 +664,9 @@ temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(EMACSRES) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(W32_RES_LINK) $(LIBES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(HAVE_PDUMPER),yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AM_V_at)$(MAKE_PDUMPER_FINGERPRINT) $@.tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ifeq ($(DO_CODESIGN),yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ codesign -s - -f $@.tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AM_V_at)mv $@.tmp $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MKDIR_P) $(etc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.10.5
</span></pre><pre style='margin:0'>
</pre>