<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/69c4040cc9369accab4e0e5899cf7249f23ba931">https://github.com/macports/macports-ports/commit/69c4040cc9369accab4e0e5899cf7249f23ba931</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 69c4040cc93 vim: Fix build with Xcode 12
</span>69c4040cc93 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 69c4040cc9369accab4e0e5899cf7249f23ba931
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Wed Sep 30 09:51:11 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> vim: Fix build with Xcode 12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Apple clang in Xcode 12 treats implicit function declarations as an
</span><span style='display:block; white-space:pre;color:#404040;'> error, which causes the check for ncurses to fail. Apply the upstream
</span><span style='display:block; white-space:pre;color:#404040;'> patch for this problem as a backport.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revision bump as it was only a build failure.
</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/61212
</span>---
editors/vim/Portfile | 2 ++
editors/vim/files/patch-xcode12.diff | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vim/Portfile b/editors/vim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2e9a62db9a6..4c36fccc49f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,8 @@ depends_lib port:ncurses \
</span> port:gettext \
port:libiconv
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-xcode12.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
set features [open ${worksrcpath}/src/feature.h a+]
puts $features "#define SYS_VIMRC_FILE \"${prefix}/etc/vimrc\""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vim/files/patch-xcode12.diff b/editors/vim/files/patch-xcode12.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5de2ad30e89
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vim/files/patch-xcode12.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream: https://github.com/vim/vim/commit/bd7f7c123db58dd7f50f4d1391577686d2f1bcc6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/auto/configure src/auto/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9c9a719d81a..41b29c2623f 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/auto/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/auto/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12106,7 +12106,7 @@ if test "x$olibs" = "x$LIBS"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking for tgetent()... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int tgetent(char *, const char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/configure.ac src/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 19ce4c7a5f3..598d73c8dfc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3510,7 +3510,7 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$olibs" = "x$LIBS"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([for tgetent()])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_TRY_LINK([],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_TRY_LINK([int tgetent(char *, const char *);],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist");],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT(yes),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([NOT FOUND!
</span></pre><pre style='margin:0'>
</pre>