emacs-mac-app-devel 20230801_0 +multitty stale patches

[rottegift (Sean Doran)]

+multitty fails to patch in emacs-mac-app-devel 20230801_0

A build of 20230801_0 without +multitty result: after (server-start) in the launched gui, an emacsclient --tty (or -t or -nw) locally within a terminal application (or when ssh-ed in from another host) will open a new gui frame instead of opening an ncurses tty frame to the launched EmacsMacApp. In emacs-mac-app-devel 20220912_0 built with +multitty it opens up an ncurses TUI frame on the launched EmacsMacApp as expected.

DEBUG: SDKROOT='/Library/Developer/CommandLineTools/SDKs/MacOSX13.sdk'
Executing:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_github.com_macports_macports-ports_aqua_emacs-mac-app/emacs-mac-app-devel/work/emacs-28.2-mac-9.1" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/github.com/macports/macports-ports/aqua/emacs-mac-app/files/patch-multi-tty'
DEBUG: system:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_github.com_macports_macports-ports_aqua_emacs-mac-app/emacs-mac-app-devel/work/emacs-28.2-mac-9.1" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/github.com/macports/macports-ports/aqua/emacs-mac-app/files/patch-multi-tty'
patching file 'lisp/server.el'
patching file 'src/frame.c'
patching file 'src/macterm.c'
2 out of 2 hunks failed--saving rejects to 'src/macterm.c.rej'
Command failed:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_github.com_macports_macports-ports_aqua_emacs-mac-app/emacs-mac-app-devel/work/emacs-28.2-mac-9.1" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/github.com/macports/macports-ports/aqua/emacs-mac-app/files/patch-multi-tty'
Exit code: 1
Error: Failed to patch emacs-mac-app-devel: command execution failed
DEBUG: Error code: CHILDSTATUS 49644 1
DEBUG: Backtrace: command execution failed
DEBUG:     while executing
DEBUG: "system {*}$notty {*}$callback {*}$nice $fullcmdstring"
DEBUG:     invoked from within
DEBUG: "command_exec patch "" "< '$patch'""
DEBUG:     (procedure "portpatch::patch_main" line 41)
DEBUG:     invoked from within
DEBUG: "$procedure $targetname"
Error: See /opt/local/var/macports/logs/_opt_local_var_macports_sources_github.com_macports_macports-ports_aqua_emacs-mac-app/emacs-mac-app-devel/main.log for details.

[amake (Aaron Madlon-Kay)]

Sorry, I've never been involved in maintaining that patch. Maybe @landonf can help?

[rottegift (Sean Doran)]

I think you just have to chop off the changes to src/macterm.c by truncating patch-multi-tty, since both chunks are rejected (and those are the only rejects) during the port patch phase. (That works for me to build it, and it seems to run fine).

[kickingvegas (Charles Choi)]

Confirming that I got this same failure trying to update emacs-mac-app.

[ryandesign (Ryan Carsten Schmidt)]

Has duplicate #68728.

[rottegift (Sean Doran)]

The update to emacs-mac-app-devel 20240325_0 still fails with +multitty

:info:patch patching file 'lisp/server.el' :info:patch 1 out of 1 hunks failed--saving rejects to 'lisp/server.el.rej' :info:patch patching file 'src/frame.c' :info:patch patching file 'src/macterm.c' :info:patch 2 out of 2 hunks failed--saving rejects to 'src/macterm.c.rej' :info:patch Command failed: cd "/opt/tmp/macports-build/_opt_local_var_macports_sources_github.com_macports_macports-ports_aqua_emacs-mac-app/emacs-mac-app-devel/work/emacs-29.1-mac-10.0" && /usr/bin/patch -p0 < '/opt/local/var/macports/sources/github.com/macports/macports-ports/aqua/emacs-mac-app/files/patch-multi-tty' :info:patch Exit code: 1 :error:patch Failed to patch emacs-mac-app-devel: command execution failed :debug:patch Error code: CHILDSTATUS 45552 1 :debug:patch Backtrace: command execution failed :debug:patch while executing :debug:patch "system {*}$notty {*}$callback {*}$nice $fullcmdstring" :debug:patch invoked from within :debug:patch "command_exec patch "" "< '$patch'"" :debug:patch (procedure "portpatch::patch_main" line 41) :debug:patch invoked from within :debug:patch "$procedure $targetname" :error:patch See /opt/local/var/macports/logs/_opt_local_var_macports_sources_github.com_macports_macports-ports_aqua_emacs-mac-app/emacs-mac-app-devel/main.log for details.

[cooljeanius (Eric Gallager)]

rejects file from attempt to patch src/macterm.c

[cooljeanius (Eric Gallager)]

I uploaded the rejects file mentioned in the error message from the patching failure

[amake (Aaron Madlon-Kay)]

Since no one has stepped up to maintain this patch, I am inclined to remove it.

[ryandesign (Ryan Carsten Schmidt)]

I'll update it.

[ryandesign (Ryan Carsten Schmidt)]

In b8501c4368ee2512b94d94aa64296c8b605cbac9/macports-ports (master):

emacs-mac-app: Refresh patches and minor changes

Refresh patches, especially the multi-tty patch.

Closes: #67908

Also use path:-based dependency for pkgconfig and use new syntax for
declaring OS version compatibility.

[ryandesign (Ryan Carsten Schmidt)]

Hopefully I have understood the patch sufficiently and have updated it correctly. I don't know emacs or this multi-tty feature being implemented by the patch, so let us know if it doesn't work.