From fe1ba5a1e396293e43dbf3e105a01c732fa98354 Mon Sep 17 00:00:00 2001
From: Zero King <l2dy@macports.org>
Date: Tue, 29 May 2018 03:16:47 +0000
Subject: [PATCH] emacs: update to 26.1
---
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(-)
diff --git a/editors/emacs/Portfile b/editors/emacs/Portfile
index f355629556..608f704d75 100644
a
|
b
|
subport emacs-app-devel { |
35 | 35 | } |
36 | 36 | |
37 | 37 | if {$subport eq $name || $subport eq "emacs-app"} { |
38 | | version 25.3 |
39 | | revision 1 |
| 38 | version 26.1 |
| 39 | revision 0 |
40 | 40 | |
41 | | checksums rmd160 8740bb96aeab77cd35c6d4625f3676991281c7bc \ |
42 | | sha256 f72c6a1b48b6fbaca2b991eed801964a208a2f8686c70940013db26cd37983c9 |
| 41 | checksums rmd160 f13fe104345738c853bcce2e3e061dbfb8692bc5 \ |
| 42 | sha256 760382d5e8cdc5d0d079e8f754bce1136fbe1473be24bb885669b0e38fc56aa3 \ |
| 43 | size 65007481 |
43 | 44 | |
44 | 45 | # our dbus is autolaunched by launchd, so disable the check that it's running |
45 | 46 | patchfiles patch-src_dbusbind.c.diff \ |
diff --git a/editors/emacs/files/patch-src_dbusbind.c.diff b/editors/emacs/files/patch-src_dbusbind.c.diff
index 07b79a2f2d..dee8972052 100644
a
|
b
|
|
1 | | --- src/dbusbind.c.orig 2013-03-13 16:52:59.000000000 -0700 |
2 | | +++ src/dbusbind.c 2013-03-13 16:53:29.000000000 -0700 |
3 | | @@ -294,8 +294,6 @@ |
4 | | if (!(EQ (bus, QCdbus_system_bus) || EQ (bus, QCdbus_session_bus))) \ |
| 1 | --- src/dbusbind.c.orig 2016-10-31 01:50:23.000000000 -0700 |
| 2 | +++ src/dbusbind.c 2016-10-31 02:00:51.000000000 -0700 |
| 3 | @@ -267,8 +267,6 @@ |
| 4 | if (!(EQ (bus, QCsystem) || EQ (bus, QCsession))) \ |
5 | 5 | XD_SIGNAL2 (build_string ("Wrong bus name"), bus); \ |
6 | 6 | /* We do not want to have an autolaunch for the session bus. */ \ |
7 | | - if (EQ (bus, QCdbus_session_bus) && session_bus_address == NULL) \ |
| 7 | - if (EQ (bus, QCsession) && session_bus_address == NULL) \ |
8 | 8 | - XD_SIGNAL2 (build_string ("No connection to bus"), bus); \ |
9 | 9 | } \ |
10 | 10 | } while (0) |
diff --git a/editors/emacs/files/patch-src_emacs.c.diff b/editors/emacs/files/patch-src_emacs.c.diff
index efaed0dcc1..cef35c21a4 100644
a
|
b
|
|
1 | | --- src/emacs.c.orig 2014-03-21 14:34:40.000000000 +0900 |
2 | | +++ src/emacs.c 2014-12-24 00:02:51.000000000 +0900 |
3 | | @@ -23,6 +23,8 @@ |
4 | | |
5 | | #include <errno.h> |
| 1 | --- src/emacs.c.orig 2016-11-11 17:20:48.000000000 -0800 |
| 2 | +++ src/emacs.c 2016-11-12 19:13:05.000000000 -0800 |
| 3 | @@ -25,6 +25,7 @@ |
| 4 | #include <fcntl.h> |
6 | 5 | #include <stdio.h> |
7 | | +#include <stdlib.h> |
| 6 | #include <stdlib.h> |
8 | 7 | +#include <string.h> |
9 | 8 | |
10 | 9 | #include <sys/types.h> |
11 | 10 | #include <sys/file.h> |
12 | | @@ -766,6 +768,24 @@ |
| 11 | @@ -743,6 +744,24 @@ |
13 | 12 | #ifdef DARWIN_OS |
14 | 13 | if (!initialized) |
15 | 14 | unexec_init_emacs_zone (); |
… |
… |
|
33 | 32 | + } |
34 | 33 | #endif |
35 | 34 | |
36 | | atexit (close_output_streams); |
| 35 | init_standard_fds (); |