<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b8501c4368ee2512b94d94aa64296c8b605cbac9">https://github.com/macports/macports-ports/commit/b8501c4368ee2512b94d94aa64296c8b605cbac9</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 b8501c4368e emacs-mac-app: Refresh patches and minor changes
</span>b8501c4368e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b8501c4368ee2512b94d94aa64296c8b605cbac9
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Apr 10 23:44:56 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> emacs-mac-app: Refresh patches and minor changes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Refresh patches, especially the multi-tty 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/67908
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also use path:-based dependency for pkgconfig and use new syntax for
</span><span style='display:block; white-space:pre;color:#404040;'> declaring OS version compatibility.
</span>---
aqua/emacs-mac-app/Portfile | 10 ++---
.../files/emacs-mac-app-devel-multi-tty.patch | 49 ++++++++++++++++++++++
...tch-multi-tty => emacs-mac-app-multi-tty.patch} | 24 +++++------
aqua/emacs-mac-app/files/patch-src_emacs.c.diff | 10 ++---
4 files changed, 69 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/Portfile b/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a2054bed4e5..2be1a3cf74e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/emacs-mac-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ description Emacs Mac port
</span> long_description ${name} is the \"Mac port\" of GNU Emacs ${emacs_version}. \
This provides a native GUI with tight OS integration.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin >= 14}
</span> license GPL-3+
checksums rmd160 616d3c3d3dd1e175af7f06423f106b1534264d45 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ autoreconf.args all
</span> depends_build port:autoconf \
port:automake \
port:libtool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig \
</span> port:texinfo \
port:sqlite3 \
port:webp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,10 +83,6 @@ platform darwin {
</span> configure.cflags-append -fobjc-arc
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} <= 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> subport ${name}-devel {
set emacs_version 29.3
set date 2024-03-25
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,7 +128,7 @@ post-destroot {
</span> }
variant multitty description {Enable Multi-TTY support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-multi-tty
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append ${subport}-multi-tty.patch
</span> }
variant rsvg description {Enable librsvg bindings} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/files/emacs-mac-app-devel-multi-tty.patch b/aqua/emacs-mac-app/files/emacs-mac-app-devel-multi-tty.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..16c93a3ffc2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/emacs-mac-app/files/emacs-mac-app-devel-multi-tty.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+George D. Plymale II's multi-tty support patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bitbucket.org/mituharu/emacs-mac/pull-requests/2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lisp/server.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lisp/server.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1268,7 +1268,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (when (or (and (eq system-type 'windows-nt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (or (daemonp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (eq window-system 'w32)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (eq window-system 'mac)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; Client runs on Windows, but the server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; runs on a Posix host.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (equal tty-name "CONOUT$"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/frame.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/frame.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1351,12 +1351,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ emacs_abort ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else /* not MSDOS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined WINDOWSNT || defined HAVE_MACGUI /* This should work now! */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (sf->output_method != output_termcap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef HAVE_MACGUI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- && sf->output_method != output_initial
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef WINDOWSNT /* This should work now! */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sf->output_method != output_termcap)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error ("Not using an ASCII terminal now; cannot make a new ASCII frame");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* not MSDOS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/macterm.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/macterm.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2980,6 +2980,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct frame *f1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct mac_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool return_no_frame_flag = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct frame *sf = SELECTED_FRAME ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ block_input ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3018,7 +3019,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f1 = XFRAME (mac_event_frame ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (f1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (f1 && sf->output_method != output_termcap)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Ok, we found a frame. Store all the values.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ last_mouse_glyph is a rectangle used to reduce the generation
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/files/patch-multi-tty b/aqua/emacs-mac-app/files/emacs-mac-app-multi-tty.patch
</span>similarity index 72%
rename from aqua/emacs-mac-app/files/patch-multi-tty
rename to aqua/emacs-mac-app/files/emacs-mac-app-multi-tty.patch
<span style='display:block; white-space:pre;color:#808080;'>index d2427252582..e31d1853a08 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-mac-app/files/patch-multi-tty
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/emacs-mac-app/files/emacs-mac-app-multi-tty.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@ https://bitbucket.org/mituharu/emacs-mac/pull-requests/2
</span>
--- lisp/server.el
+++ lisp/server.el
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1182,10 +1182,9 @@ The following commands are accepted by the client:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1263,10 +1263,9 @@
</span> ;; choice there.) In daemon mode on Windows, we can't
;; make tty frames, so force the frame type to GUI
;; there too.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ https://bitbucket.org/mituharu/emacs-mac/pull-requests/2
</span> ;; -position +LINE[:COLUMN]: Set point to the given
--- src/frame.c
+++ src/frame.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1267,12 +1267,8 @@ affects all frames on the same terminal device. */)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1351,12 +1351,8 @@
</span> emacs_abort ();
#else /* not MSDOS */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,20 +36,20 @@ https://bitbucket.org/mituharu/emacs-mac/pull-requests/2
</span> #endif /* not MSDOS */
--- src/macterm.c
+++ src/macterm.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2946,6 +2946,7 @@ mac_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2980,6 +2980,7 @@
</span> struct frame *f1;
struct mac_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool return_no_frame_flag = false;
</span> + struct frame *sf = SELECTED_FRAME ();
block_input ();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2966,7 +2967,7 @@ mac_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f1 = XFRAME (mac_event_frame ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3018,7 +3019,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f1 = XFRAME (mac_event_frame ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (f1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (f1 && sf->output_method != output_termcap)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Ok, we found a frame. Store all the values.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- last_mouse_glyph is a rectangle used to reduce the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (f1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (f1 && sf->output_method != output_termcap)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Ok, we found a frame. Store all the values.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ last_mouse_glyph is a rectangle used to reduce the generation
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/emacs-mac-app/files/patch-src_emacs.c.diff b/aqua/emacs-mac-app/files/patch-src_emacs.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d30be77813e..4ae030b0e4d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/emacs-mac-app/files/patch-src_emacs.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/emacs-mac-app/files/patch-src_emacs.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/emacs.c.orig 2018-05-29 03:16:36.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/emacs.c 2018-05-29 14:25:27.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/emacs.c.orig 2023-08-05 02:18:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/emacs.c 2024-04-10 21:18:14.000000000 -0500
</span> @@ -24,6 +24,7 @@
#include <errno.h>
#include <fcntl.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,9 +7,9 @@
</span> +#include <string.h>
#include <sys/file.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -771,6 +772,25 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined DARWIN_OS && !defined CANNOT_DUMP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1407,6 +1408,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined DARWIN_OS && defined HAVE_UNEXEC
</span> if (!initialized)
unexec_init_emacs_zone ();
+
</pre><pre style='margin:0'>
</pre>