<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/7100e21ad4b05520412ea61fd6c5db46827d2d71">https://github.com/macports/macports-ports/commit/7100e21ad4b05520412ea61fd6c5db46827d2d71</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 7100e21 Merge pull request #5854 from wyuenho/update-emacs-devel
</span>7100e21 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7100e21ad4b05520412ea61fd6c5db46827d2d71
</span>Author: Jimmy Yuen Ho Wong <wyuenho@users.noreply.github.com>
AuthorDate: Sun Nov 24 06:09:00 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> Merge pull request #5854 from wyuenho/update-emacs-devel
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update emacs-devel and emacs-app-devel to 20191120
</span>---
editors/emacs/Portfile | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 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 b931c4a..6450429 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;'>@@ -88,11 +88,11 @@ if {$subport eq $name || $subport eq "emacs-app"} {
</span>
if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190829
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20191120
</span>
fetch.type git
git.url http://git.savannah.gnu.org/r/emacs.git
<span style='display:block; white-space:pre;background:#ffe0e0;'>- git.branch 9df285250bc30b5ba86a19c817eea0c56164e022
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git.branch c928f41330ece779127a0c4c9b6ca0fdde8a1046
</span>
pre-configure {
system -W ${worksrcpath} "sh ./autogen.sh"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,6 +134,10 @@ if {$subport eq $name || $subport eq "emacs-devel"} {
</span> port:lcms2 \
port:Xft2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subport eq "emacs-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:harfbuzz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # autoconf appears to be dropping linker flags for freetype &
# fontconfig; work around this. See #28083
configure.ldflags-append -lfreetype -lfontconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,6 +186,10 @@ if {$subport eq $name || $subport eq "emacs-devel"} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq "emacs-app-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --without-harfbuzz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
categories-append aqua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,12 +215,11 @@ if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
</span>
if {$subport eq "emacs-app"} {
revision 4
<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;'>- variant multicolor_font description {Apply multicolor font patch} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Revert "Disable multicolor fonts on OS X..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This reverts commit 9344612d3cd164317170b6189ec43175757e4231.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-enable-multicolor-fonts.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant multicolor_font description {Apply multicolor font patch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Revert "Disable multicolor fonts on OS X..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This reverts commit 9344612d3cd164317170b6189ec43175757e4231.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-enable-multicolor-fonts.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant imagemagick description {Use ImageMagick} {
</pre><pre style='margin:0'>
</pre>