<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/78edb0d6f391e638ec188710fb2ddbaae301489a">https://github.com/macports/macports-ports/commit/78edb0d6f391e638ec188710fb2ddbaae301489a</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 78edb0d emacs: update to v26.1
</span>78edb0d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 78edb0d6f391e638ec188710fb2ddbaae301489a
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Tue May 29 14:39:56 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> emacs: update to v26.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56547
</span>---
editors/emacs/Portfile | 9 +++++----
editors/emacs/files/patch-src_dbusbind.c.diff | 10 +++++-----
editors/emacs/files/patch-src_emacs.c.diff | 15 +++++++--------
3 files changed, 17 insertions(+), 17 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 f355629..608f704 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;'>@@ -35,11 +35,12 @@ subport emacs-app-devel {
</span> }
if {$subport eq $name || $subport eq "emacs-app"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 25.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 26.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 8740bb96aeab77cd35c6d4625f3676991281c7bc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f72c6a1b48b6fbaca2b991eed801964a208a2f8686c70940013db26cd37983c9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 f13fe104345738c853bcce2e3e061dbfb8692bc5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 760382d5e8cdc5d0d079e8f754bce1136fbe1473be24bb885669b0e38fc56aa3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 65007481
</span>
# our dbus is autolaunched by launchd, so disable the check that it's running
patchfiles patch-src_dbusbind.c.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-src_dbusbind.c.diff b/editors/emacs/files/patch-src_dbusbind.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 07b79a2..dee8972 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/patch-src_dbusbind.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/files/patch-src_dbusbind.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/dbusbind.c.orig 2013-03-13 16:52:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/dbusbind.c 2013-03-13 16:53:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -294,8 +294,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(EQ (bus, QCdbus_system_bus) || EQ (bus, QCdbus_session_bus))) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dbusbind.c.orig 2016-10-31 01:50:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dbusbind.c 2016-10-31 02:00:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -267,8 +267,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!(EQ (bus, QCsystem) || EQ (bus, QCsession))) \
</span> XD_SIGNAL2 (build_string ("Wrong bus name"), bus); \
/* We do not want to have an autolaunch for the session bus. */ \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (EQ (bus, QCdbus_session_bus) && session_bus_address == NULL) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (EQ (bus, QCsession) && session_bus_address == NULL) \
</span> - XD_SIGNAL2 (build_string ("No connection to bus"), bus); \
} \
} while (0)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-src_emacs.c.diff b/editors/emacs/files/patch-src_emacs.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index efaed0d..cef35c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/patch-src_emacs.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/files/patch-src_emacs.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/emacs.c.orig 2014-03-21 14:34:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/emacs.c 2014-12-24 00:02:51.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/emacs.c.orig 2016-11-11 17:20:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/emacs.c 2016-11-12 19:13:05.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span> #include <stdio.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span> +#include <string.h>
#include <sys/types.h>
#include <sys/file.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -766,6 +768,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -743,6 +744,24 @@
</span> #ifdef DARWIN_OS
if (!initialized)
unexec_init_emacs_zone ();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,4 +32,4 @@
</span> + }
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- atexit (close_output_streams);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ init_standard_fds ();
</span></pre><pre style='margin:0'>
</pre>