<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/7d3adb147a44ba1bf95aa8c80351c198b9021064">https://github.com/macports/macports-ports/commit/7d3adb147a44ba1bf95aa8c80351c198b9021064</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 7d3adb1 emacs-app: fix broken inline patch introduced by #1936
</span>7d3adb1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7d3adb147a44ba1bf95aa8c80351c198b9021064
</span>Author: Jimmy Yuen Ho Wong <wyuenho@gmail.com>
AuthorDate: Tue Jun 5 02:15:39 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> emacs-app: fix broken inline patch introduced by #1936
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * removed non-existent dirs from the patch
</span><span style='display:block; white-space:pre;color:#404040;'> * moved the x11 variant to be exclusive to the emacs and emacs-devel port
</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/56610
</span>---
editors/emacs/Portfile | 59 ++++++++++-----------
.../emacs/files/patch-inline-25.2-20170426.diff | 60 +++++++++++-----------
2 files changed, 58 insertions(+), 61 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 2099ab7..5798c4b 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;'>@@ -44,9 +44,7 @@ if {$subport eq $name || $subport eq "emacs-app"} {
</span> sha256 760382d5e8cdc5d0d079e8f754bce1136fbe1473be24bb885669b0e38fc56aa3 \
size 65007481
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # our dbus is autolaunched by launchd, so disable the check that it's running
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-src_dbusbind.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-configure.diff
</span>
pre-configure {
system -W ${worksrcpath} "sh ./autogen.sh"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,33 +101,6 @@ post-destroot {
</span> delete ${destroot}${prefix}/share/man/man1/ctags.1.gz
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant x11 description {Builds emacs as a X11 program with Lucid widgets} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-x-toolkit=lucid \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xaw3d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-imagemagick \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xpm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-jpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gif \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-png \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-rsvg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xft
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:xorg-libXmu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXaw \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xpm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:giflib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:Xft2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # autoconf appears to be dropping linker flags for freetype &
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fontconfig; work around this. See #28083
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -lfreetype -lfontconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin {
post-patch {
# Leopard's XCode 3.1.x ld(1) man page claims -no_pie is supported, but it's not
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,9 +112,35 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name} || ${subport} eq "emacs-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name || $subport eq "emacs-devel"} {
</span> PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant x11 description {Builds emacs as a X11 program with Lucid widgets} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-x-toolkit=lucid \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-xaw3d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-imagemagick \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-xpm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gif \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-png \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-rsvg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-xft
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:xorg-libXmu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXaw \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xpm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:giflib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:Xft2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # autoconf appears to be dropping linker flags for freetype &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fontconfig; work around this. See #28083
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -lfreetype -lfontconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant motif requires x11 description {Builds emacs as an X11 program with Motif widgets} {
configure.args-delete --with-x-toolkit=lucid
configure.args-append --with-x-toolkit=motif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/files/patch-inline-25.2-20170426.diff b/editors/emacs/files/patch-inline-25.2-20170426.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d66592f..c96dca4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/files/patch-inline-25.2-20170426.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/files/patch-inline-25.2-20170426.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -crN emacs-25.2_orig/configure.ac emacs-25.2/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** emacs-25.2_orig/configure.ac 2017-02-03 23:34:30.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- emacs-25.2/configure.ac 2017-04-26 14:45:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -crN configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** configure.ac 2017-02-03 23:34:30.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac 2017-04-26 14:45:40.000000000 +0900
</span> ***************
*** 1915,1921 ****
INSTALL_ARCH_INDEP_EXTRA=
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +35,9 @@ diff -crN emacs-25.2_orig/configure.ac emacs-25.2/configure.ac
</span> if test "$NS_IMPL_COCOA" = "yes"; then
libs_nsgui="$libs_nsgui -framework IOKit"
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -crN emacs-25.2_orig/lisp/term/common-win.el emacs-25.2/lisp/term/common-win.el
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** emacs-25.2_orig/lisp/term/common-win.el 2017-02-03 19:25:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- emacs-25.2/lisp/term/common-win.el 2017-04-26 14:45:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -crN lisp/term/common-win.el lisp/term/common-win.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** lisp/term/common-win.el 2017-02-03 19:25:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lisp/term/common-win.el 2017-04-26 14:45:40.000000000 +0900
</span> ***************
*** 73,78 ****
--- 73,79 ----
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,9 +48,9 @@ diff -crN emacs-25.2_orig/lisp/term/common-win.el emacs-25.2/lisp/term/common-wi
</span> ))))
(set-terminal-parameter frame 'x-setup-function-keys t)))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -crN emacs-25.2_orig/lisp/term/ns-win.el emacs-25.2/lisp/term/ns-win.el
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** emacs-25.2_orig/lisp/term/ns-win.el 2017-02-03 19:25:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- emacs-25.2/lisp/term/ns-win.el 2017-04-26 14:45:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -crN lisp/term/ns-win.el lisp/term/ns-win.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** lisp/term/ns-win.el 2017-02-03 19:25:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lisp/term/ns-win.el 2017-04-26 14:45:40.000000000 +0900
</span> ***************
*** 169,175 ****
(define-key global-map [ns-new-frame] 'make-frame)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -752,9 +752,9 @@ diff -crN emacs-25.2_orig/lisp/term/ns-win.el emacs-25.2/lisp/term/ns-win.el
</span> (provide 'ns-win)
;;; ns-win.el ends here
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -crN emacs-25.2_orig/src/Makefile.in emacs-25.2/src/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** emacs-25.2_orig/src/Makefile.in 2017-02-03 19:25:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- emacs-25.2/src/Makefile.in 2017-04-26 14:45:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -crN src/Makefile.in src/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** src/Makefile.in 2017-02-03 19:25:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.in 2017-04-26 14:45:40.000000000 +0900
</span> ***************
*** 409,415 ****
SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -772,9 +772,9 @@ diff -crN emacs-25.2_orig/src/Makefile.in emacs-25.2/src/Makefile.in
</span> w32.o w32console.o w32fns.o w32heap.o w32inevt.o w32notify.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
w16select.o widget.o xfont.o ftfont.o xftfont.o ftxfont.o gtkutil.o \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -crN emacs-25.2_orig/src/keyboard.c emacs-25.2/src/keyboard.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** emacs-25.2_orig/src/keyboard.c 2017-04-20 23:50:42.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- emacs-25.2/src/keyboard.c 2017-04-26 14:45:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -crN src/keyboard.c src/keyboard.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** src/keyboard.c 2017-04-20 23:50:42.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/keyboard.c 2017-04-26 14:45:40.000000000 +0900
</span> ***************
*** 2472,2481 ****
swallow_events (false); /* May clear input_pending. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -829,9 +829,9 @@ diff -crN emacs-25.2_orig/src/keyboard.c emacs-25.2/src/keyboard.c
</span> /* Here we used to use `ignore-event' which would simple set prefix-arg to
current-prefix-arg, as is done in `handle-switch-frame'.
But `handle-switch-frame is not run from the special-map.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -crN emacs-25.2_orig/src/macim.m emacs-25.2/src/macim.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** emacs-25.2_orig/src/macim.m 1970-01-01 09:00:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- emacs-25.2/src/macim.m 2017-04-26 14:50:48.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -crN src/macim.m src/macim.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** src/macim.m 1970-01-01 09:00:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/macim.m 2017-04-26 14:50:48.000000000 +0900
</span> ***************
*** 0 ****
--- 1,193 ----
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1028,9 +1028,9 @@ diff -crN emacs-25.2_orig/src/macim.m emacs-25.2/src/macim.m
</span> + defsubr (&Smac_toggle_input_source);
+ }
+ #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -crN emacs-25.2_orig/src/nsfns.m emacs-25.2/src/nsfns.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** emacs-25.2_orig/src/nsfns.m 2017-02-03 19:25:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- emacs-25.2/src/nsfns.m 2017-04-26 14:45:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -crN src/nsfns.m src/nsfns.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** src/nsfns.m 2017-02-03 19:25:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/nsfns.m 2017-04-26 14:45:40.000000000 +0900
</span> ***************
*** 3136,3141 ****
--- 3136,3157 ----
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1069,9 +1069,9 @@ diff -crN emacs-25.2_orig/src/nsfns.m emacs-25.2/src/nsfns.m
</span> as_status = 0;
as_script = Qnil;
as_result = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -crN emacs-25.2_orig/src/nsterm.h emacs-25.2/src/nsterm.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** emacs-25.2_orig/src/nsterm.h 2017-02-03 19:25:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- emacs-25.2/src/nsterm.h 2017-04-26 14:45:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -crN src/nsterm.h src/nsterm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** src/nsterm.h 2017-02-03 19:25:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/nsterm.h 2017-04-26 14:45:40.000000000 +0900
</span> ***************
*** 757,762 ****
--- 757,764 ----
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1083,9 +1083,9 @@ diff -crN emacs-25.2_orig/src/nsterm.h emacs-25.2/src/nsterm.h
</span>
/* could use list to store these, but rest of emacs has a big infrastructure
for managing a table of bitmap "records" */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -crN emacs-25.2_orig/src/nsterm.m emacs-25.2/src/nsterm.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** emacs-25.2_orig/src/nsterm.m 2017-02-03 19:25:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- emacs-25.2/src/nsterm.m 2017-04-26 14:45:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -crN src/nsterm.m src/nsterm.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** src/nsterm.m 2017-02-03 19:25:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/nsterm.m 2017-04-26 14:45:40.000000000 +0900
</span> ***************
*** 4859,4865 ****
/* [[NSNotificationCenter defaultCenter] addObserver: NSApp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1291,9 +1291,9 @@ diff -crN emacs-25.2_orig/src/nsterm.m emacs-25.2/src/nsterm.m
</span> /* Tell Emacs about this window system. */
Fprovide (Qns, Qnil);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -crN emacs-25.2_orig/src/termhooks.h emacs-25.2/src/termhooks.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** emacs-25.2_orig/src/termhooks.h 2017-02-03 19:25:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- emacs-25.2/src/termhooks.h 2017-04-26 14:45:40.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -crN src/termhooks.h src/termhooks.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*** src/termhooks.h 2017-02-03 19:25:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/termhooks.h 2017-04-26 14:45:40.000000000 +0900
</span> ***************
*** 59,64 ****
--- 59,65 ----
</pre><pre style='margin:0'>
</pre>