<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dc0ce7f6c27c99ead89e52fa4dc8fb31d8237af8">https://github.com/macports/macports-ports/commit/dc0ce7f6c27c99ead89e52fa4dc8fb31d8237af8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dc0ce7f6c27c99ead89e52fa4dc8fb31d8237af8
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Apr 8 18:37:56 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> emacs: Update dbus variant patch
</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/64962
</span>---
editors/emacs/Portfile | 1 -
editors/emacs/files/patch-src_dbusbind.c.diff | 13 ++++++++-----
2 files changed, 8 insertions(+), 6 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 43977e8452a..977f6d2c14a 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;'>@@ -8,7 +8,6 @@ PortGroup legacysupport 1.1
</span> legacysupport.newest_darwin_requires_legacy 13
name emacs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> categories editors
license GPL-3+
maintainers {dports @drkp} openmaintainer
<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 dee89720529..93bb7f30bb3 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,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/dbusbind.c.orig 2016-10-31 01:50:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/dbusbind.c 2016-10-31 02:00:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -267,8 +267,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!(EQ (bus, QCsystem) || EQ (bus, QCsession))) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Disable the check that dbus is running, since MacPorts dbus is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autolaunched by launchd.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dbusbind.c.orig 2022-03-11 01:04:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dbusbind.c 2022-04-08 18:34:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -303,9 +303,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || EQ (bus, QCsession_private))) \
</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, QCsession) && session_bus_address == NULL) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((EQ (bus, QCsession) || EQ (bus, QCsession_private)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- && session_bus_address == NULL) \
</span> - XD_SIGNAL2 (build_string ("No connection to bus"), bus); \
} \
} while (0)
</pre><pre style='margin:0'>
</pre>