<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f6aafd5284c128370a2aeb2d5027b6e06fa32ce7">https://github.com/macports/macports-ports/commit/f6aafd5284c128370a2aeb2d5027b6e06fa32ce7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f6aafd5284c128370a2aeb2d5027b6e06fa32ce7
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Tue Aug 11 08:30:58 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> emacs: update version to 27.1
</span>---
editors/emacs/Portfile | 25 +++-----
editors/emacs/files/patch-Info.plist.in.diff | 12 ++--
editors/emacs/files/patch-fix-unexec.diff | 85 ----------------------------
3 files changed, 15 insertions(+), 107 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/Portfile b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e820c6fb925..387e41a3ac0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,14 +78,14 @@ platform darwin {
</span> }
if {$subport eq $name || $subport eq "emacs-app"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 26.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 27.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 263c0152f538d3371c60accb710f3825b01ae097 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 09c747e048137c99ed35747b012910b704e0974dde4db6696fde7054ce387591 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 65207899
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9ddfd28ab54c4aee168eeecb783d13599e5b5288 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ffbfa61dc951b92cf31ebe3efc86c5a9d4411a1222b8a4ae6716cfd0e2a584db \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 65782481
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-configure.diff patch-fix-unexec.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-configure.diff
</span>
pre-configure {
system -W ${worksrcpath} "sh ./autogen.sh"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,11 +140,8 @@ if {$subport eq $name || $subport eq "emacs-devel"} {
</span> port:giflib \
port:libpng \
port:lcms2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:Xft2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$subport eq "emacs-devel"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:harfbuzz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:Xft2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:harfbuzz
</span>
# autoconf appears to be dropping linker flags for freetype &
# fontconfig; work around this. See #28083
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,14 +191,10 @@ if {$subport eq $name || $subport eq "emacs-devel"} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport eq "emacs-app-devel"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --without-harfbuzz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
categories-append aqua
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-ns --with-lcms2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-ns --with-lcms2 --without-harfbuzz
</span> configure.args-delete --without-ns --without-x
depends_lib-append port:lcms2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-Info.plist.in.diff b/editors/emacs/files/patch-Info.plist.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 302db452d58..057ad5b0b0e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/patch-Info.plist.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/files/patch-Info.plist.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nextstep/templates/Info.plist.in.orig 2020-05-26 19:02:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nextstep/templates/Info.plist.in 2020-05-26 19:03:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -677,5 +677,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>YES</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>NSAppleEventsUsageDescription</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>Emacs requires permission to send AppleEvents to other applications.</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nextstep/templates/Info.plist.in.orig 2020-05-26 00:33:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nextstep/templates/Info.plist.in 2020-05-26 00:34:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -685,5 +685,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>Emacs requires permission to access the Downloads folder.</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>NSRemovableVolumesUsageDescription</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>Emacs requires permission to access files on Removable Volumes.</string>
</span> + <key>LSEnvironment</key>
+ <dict>
+ <key>PATH</key>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-fix-unexec.diff b/editors/emacs/files/patch-fix-unexec.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 09c74a077e6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/patch-fix-unexec.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,85 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 888ffd960c06d56a409a7ff15b1d930d25c56089 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 16 Feb 2020 09:50:26 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Fix unexec failure on macOS 10.15.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* src/unexmacosx.c (unexec_regions_merge): Align region start addresses to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-page boundaries and then merge regions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/unexmacosx.c | 47 ++++++++++++++++++++++++-----------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 24 insertions(+), 23 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(limited to 'src/unexmacosx.c')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/unexmacosx.c b/src/unexmacosx.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8d132417e8..59cbe3c18b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/unexmacosx.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/unexmacosx.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -503,22 +503,34 @@ unexec_regions_sort_compare (const void *a, const void *b)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unexec_regions_merge (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int i, n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- unexec_region_info r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vm_size_t padsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qsort (unexec_regions, num_unexec_regions, sizeof (unexec_regions[0]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &unexec_regions_sort_compare);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- n = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- r = unexec_regions[0];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- padsize = r.range.address & (pagesize - 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (padsize)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Align each region start address to a page boundary. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (unexec_region_info *cur = unexec_regions;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cur < unexec_regions + num_unexec_regions; cur++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- r.range.address -= padsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- r.range.size += padsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- r.filesize += padsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vm_size_t padsize = cur->range.address & (pagesize - 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (padsize)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cur->range.address -= padsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cur->range.size += padsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cur->filesize += padsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unexec_region_info *prev = cur == unexec_regions ? NULL : cur - 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (prev
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && prev->range.address + prev->range.size > cur->range.address)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ prev->range.size = cur->range.address - prev->range.address;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (prev->filesize > prev->range.size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ prev->filesize = prev->range.size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (i = 1; i < num_unexec_regions; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int n = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unexec_region_info r = unexec_regions[0];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (int i = 1; i < num_unexec_regions; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (r.range.address + r.range.size == unexec_regions[i].range.address
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && r.range.size - r.filesize < 2 * pagesize)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -530,17 +542,6 @@ unexec_regions_merge (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unexec_regions[n++] = r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r = unexec_regions[i];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- padsize = r.range.address & (pagesize - 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (padsize)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((unexec_regions[n-1].range.address
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- + unexec_regions[n-1].range.size) == r.range.address)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- unexec_regions[n-1].range.size -= padsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- r.range.address -= padsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- r.range.size += padsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- r.filesize += padsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unexec_regions[n++] = r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cgit v1.2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>