<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/c129f1a739c759c64b009972b4745d052f52b3f8">https://github.com/macports/macports-ports/commit/c129f1a739c759c64b009972b4745d052f52b3f8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c129f1a739c759c64b009972b4745d052f52b3f8
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Apr 5 16:11:59 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> MacVim: Update to version 8.2.snapshot171
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Re-roll patches as needed
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove patch applied by upstream
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove Sparkle by using --disable-sparkle
</span><span style='display:block; white-space:pre;color:#404040;'> - Patch UI to remove references to updater
</span>---
editors/MacVim/Portfile | 21 +++-----
.../ce7be3a0e6f19bc85990bb8fcfe5e208944777b4.patch | 62 ----------------------
editors/MacVim/files/patch-python.diff | 10 ++--
editors/MacVim/files/patch-python3.diff | 6 +--
.../MacVim/files/patch-remove-Homebrew-python.diff | 22 ++++----
...move-sparkle.diff => patch-remove-updater.diff} | 41 +++++++++++---
editors/MacVim/files/patch-tcl.diff | 17 +++---
7 files changed, 69 insertions(+), 110 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/Portfile b/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 31c89308333..5d999f2defb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,9 +5,8 @@ PortGroup github 1.0
</span> PortGroup compiler_blacklist_versions 1.0
set vim_version 8.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set snapshot 166
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set snapshot 171
</span> github.setup macvim-dev macvim ${snapshot} snapshot-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> name MacVim
version ${vim_version}.snapshot${snapshot}
categories editors
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +21,9 @@ long_description \
</span>
homepage https://macvim-dev.github.io/macvim/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 653794d83ca1dbf116a3c765acea5d25b5f6749f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7ebc9c5ad56e4a75a3fc1c35b2730c646f5fb82635c04b9e5b8e9192e92652f7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21834717
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 884dc22e50e9ecf5acd8754d046674849b478e97 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 51ee54b7c3b2dd5ec6d9856117ca12e90dd7694f06c8d40ca2830f375a6f8f76 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22966978
</span>
depends_lib port:ncurses \
port:gettext \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,9 +33,8 @@ depends_lib port:ncurses \
</span> # https://trac.macports.org/ticket/54666
supported_archs x86_64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-remove-sparkle.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-remove-updater.diff \
</span> patch-remove-Homebrew-python.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ce7be3a0e6f19bc85990bb8fcfe5e208944777b4.patch
</span>
pre-fetch {
if {${os.platform} eq "darwin" && ${os.major} < 12} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,14 +51,6 @@ post-extract {
</span> file mkdir ${workpath}/caches
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # recompile patched .nib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach nib {Preferences MainMenu} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "---> Running ibtool for ${nib}.nib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "ibtool --compile src/MacVim/English.lproj/${nib}.nib/keyedobjects.nib src/MacVim/English.lproj/${nib}.nib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_xcode yes
autoconf.cmd make autoconf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,6 +61,7 @@ autoconf.dir ${worksrcpath}/src
</span> configure.args --enable-gui=macvim \
--without-x \
--without-local-dir \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-sparkle \
</span> --disable-gpm \
--with-tlib=ncurses \
--enable-multibyte \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/ce7be3a0e6f19bc85990bb8fcfe5e208944777b4.patch b/editors/MacVim/files/ce7be3a0e6f19bc85990bb8fcfe5e208944777b4.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 91eb09089c1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/ce7be3a0e6f19bc85990bb8fcfe5e208944777b4.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,62 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ce7be3a0e6f19bc85990bb8fcfe5e208944777b4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Bram Moolenaar <Bram@vim.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 26 Nov 2020 20:11:11 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] patch 8.2.2056: configure fails when building with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- implicit-function-declaration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Problem: Configure fails when building with the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "implicit-function-declaration" error enabled, specifically on Mac.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Solution: Declear the functions like in the source code. (suggestion by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Clemens Lang, closes #7380)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Backport [https://github.com/vim/vim/commit/ce7be3a0e6f19bc85990bb8fcfe5e208944777b4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/auto/configure | 10 +++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/configure.ac | 10 +++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/version.c | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 20 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/auto/configure b/src/auto/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 13eaea6f853..d1359485b60 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/auto/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/auto/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12350,10 +12350,18 @@ if test -c /dev/ptmx ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// These should be in stdlib.h, but it depends on _XOPEN_SOURCE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+char *ptsname(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int unlockpt(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int grantpt(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ptsname(0);grantpt(0);unlockpt(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ptsname(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ grantpt(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unlockpt(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/configure.ac b/src/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 457f2b82b13..010cc8f09ca 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3593,7 +3593,15 @@ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING(for SVR4 ptys)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -c /dev/ptmx ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_TRY_LINK([], [ptsname(0);grantpt(0);unlockpt(0);],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_TRY_LINK([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// These should be in stdlib.h, but it depends on _XOPEN_SOURCE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+char *ptsname(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int unlockpt(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int grantpt(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ptsname(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ grantpt(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unlockpt(0);],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SVR4_PTYS),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT(no))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-python.diff b/editors/MacVim/files/patch-python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d0fcceff75..0e7a9a44061 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-python.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;'>---- src/configure.ac.orig 2018-05-24 06:33:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/configure.ac 2018-06-12 18:46:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1267,7 +1267,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/configure.ac 2021-04-05 15:12:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/configure.ac 2021-04-05 15:12:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1336,7 +1336,7 @@
</span> @echo "python_SYSLIBS='$(SYSLIBS)'"
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
@echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
@echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
@echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1275,13 +1275,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1344,13 +1344,6 @@
</span> dnl -- delete the lines from make about Entering/Leaving directory
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
rm -f -- "${tmp_mkf}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@
</span> vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
dnl -- Check if the path contained in python_LINKFORSHARED is
dnl usable for vim build. If not, make and try other
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1305,7 +1298,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1374,7 +1367,6 @@
</span> vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
dnl remove -ltermcap, it can conflict with an earlier -lncurses
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-python3.diff b/editors/MacVim/files/patch-python3.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 41242d97dea..8b8e5eca451 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-python3.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;'>---- src/configure.ac.orig 2016-09-12 16:31:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/configure.ac 2016-09-12 19:26:47.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1522,7 +1522,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/configure.ac 2021-04-05 15:48:50.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/configure.ac 2021-04-05 15:48:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1591,7 +1591,7 @@
</span> @echo "python3_LIBS='$(LIBS)'"
@echo "python3_SYSLIBS='$(SYSLIBS)'"
@echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-remove-Homebrew-python.diff b/editors/MacVim/files/patch-remove-Homebrew-python.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bc102d12f78..5b445a2a896 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-remove-Homebrew-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-remove-Homebrew-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/MacVim/vimrc 2020-09-15 01:48:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/MacVim/vimrc 2020-09-15 01:54:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,36 +13,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " the entire MacVim menu is set up in a nib file which currently only is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " translated to English).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set langmenu=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/MacVim/vimrc 2021-04-01 10:32:44.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/MacVim/vimrc 2021-04-05 14:56:37.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,36 +8,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " The default for 'backspace' is very confusing to new users, so change it to a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " more sensible value. Add "set backspace&" to your ~/.vimrc to reset it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set backspace+=indent,eol,start
</span> -
-" Python2
-" MacVim is configured by default to use the pre-installed System python2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,12 +28,12 @@
</span> -" or an installation from python.org:
-if exists("&pythonthreedll") && exists("&pythonthreehome") &&
- \ !filereadable(&pythonthreedll)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- " MacPorts python 3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.8/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " MacPorts python 3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.9/Python")
</span> - " https://www.python.org/downloads/mac-osx/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.8/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.9/Python
</span> - endif
-endif
-
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-remove-sparkle.diff b/editors/MacVim/files/patch-remove-updater.diff
</span>similarity index 63%
rename from editors/MacVim/files/patch-remove-sparkle.diff
rename to editors/MacVim/files/patch-remove-updater.diff
<span style='display:block; white-space:pre;color:#808080;'>index 78485d07fc4..efea3aa66a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-remove-sparkle.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-remove-updater.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,39 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/MacVim/English.lproj/Preferences.nib/designable.nib 2020-09-15 01:22:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/MacVim/English.lproj/Preferences.nib/designable.nib 2020-09-15 01:36:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,49 +180,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/MacVim/Base.lproj/MainMenu.xib 2021-04-05 15:55:00.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/MacVim/Base.lproj/MainMenu.xib 2021-04-05 15:55:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,11 +24,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </menuItem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <menuItem title="Check for Updates…" id="255">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <action selector="checkForUpdates:" target="235" id="Vif-VP-y50"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </menuItem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <menuItem isSeparatorItem="YES" id="196">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </menuItem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/MacVim/Base.lproj/Preferences.xib 2021-04-05 16:02:16.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/MacVim/Base.lproj/Preferences.xib 2021-04-05 16:04:16.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,10 +10,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="advancedPreferences" destination="620" id="632"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="appearancePreferences" destination="hr4-G4-3ZG" id="G54-DD-ACh"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <outlet property="autoInstallUpdateButton" destination="UYM-W0-Kgl" id="cX5-tk-9WJ"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="generalPreferences" destination="115" id="143"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="layoutPopUpButton" destination="427" id="596"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <outlet property="sparkleUpdaterPane" destination="0hT-y8-Hge" id="e0L-sv-OCW"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </customObject>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,49 +178,6 @@
</span> </popUpButton>
</subviews>
</customView>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0hT-y8-Hge" userLabel="Updater">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <customView id="0hT-y8-Hge" userLabel="Updater">
</span> - <rect key="frame" x="19" y="22" width="444" height="36"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <subviews>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="122">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <button id="122">
</span> - <rect key="frame" x="188" y="18" width="258" height="18"/>
- <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
- <string key="toolTip">Checks for updates and presents a dialog box showing the release notes and prompt for whether you want to install the new version.</string>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +46,7 @@
</span> - <binding destination="58" name="value" keyPath="values.SUCheckAtStartup" id="169"/>
- </connections>
- </button>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UYM-W0-Kgl" userLabel="Auto-install updates">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <button id="UYM-W0-Kgl" userLabel="Auto-install updates">
</span> - <rect key="frame" x="202" y="-2" width="244" height="18"/>
- <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
- <string key="toolTip">MacVim will automatically download and install updates without prompting. The updated version will be used the next time MacVim starts.</string>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +61,7 @@
</span> - <binding destination="58" name="value" keyPath="values.SUAutomaticallyUpdate" id="kyZ-ah-zKf"/>
- </connections>
- </button>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="124">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="124">
</span> - <rect key="frame" x="-2" y="19" width="187" height="17"/>
- <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
- <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="When MacVim launches:" id="976">
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,5 +73,5 @@
</span> - </subviews>
- </customView>
</subviews>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <point key="canvasLocation" x="137.5" y="382"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <point key="canvasLocation" x="138" y="20"/>
</span> </customView>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/MacVim/files/patch-tcl.diff b/editors/MacVim/files/patch-tcl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4959e51d591..4d8a65524a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/MacVim/files/patch-tcl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/MacVim/files/patch-tcl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/configure.ac.orig 2017-11-10 11:54:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/configure.ac 2017-11-10 11:57:09.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1783,12 +1783,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/configure.ac 2021-04-05 15:12:49.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/configure.ac 2021-04-05 15:17:45.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1914,14 +1914,7 @@
</span> tcldll=`echo 'puts libtcl[[info tclversion]][[info sharedlibextension]]' | $vi_cv_path_tcl -`
AC_MSG_CHECKING(for location of Tcl include)
- if test "x$MACOS_X" != "xyes"; then
- tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
- else
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl For all macOS, use the value from TCL in case use of, say, homebrew
</span> - dnl For Mac OS X 10.3, use the OS-provided framework location
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl For Mac OS X 10.14, the OS-provided framework location doesn't contain the headers, so also check the Xcode SDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /System/Library/Frameworks/Tcl.framework/Headers `xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework/Versions/Current/Headers"
</span> - fi
+ tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver"
TCL_INC=
for try in $tclinc; do
if test -f "$try/tcl.h"; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1803,13 +1798,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1936,16 +1929,8 @@
</span> fi
if test -z "$SKIP_TCL"; then
AC_MSG_CHECKING(for location of tclConfig.sh script)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,8 +24,11 @@
</span> - tclcnf=`echo $tclinc | sed s/include/lib/g`
- tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
- else
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl For all macOS, use the value from TCL in case use of, say, homebrew
</span> - dnl For Mac OS X 10.3, use the OS-provided framework location
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- tclcnf="/System/Library/Frameworks/Tcl.framework"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl For Mac OS X 10.14, the OS-provided framework location doesn't contain the headers, so also check the Xcode SDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tclcnf=`echo $tclinc | sed s/include/lib/g`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tclcnf="$tclcnf /System/Library/Frameworks/Tcl.framework `xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework"
</span> - fi
+ tclcnf=`echo $tclinc | sed s/include/lib/g`
+ tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
</pre><pre style='margin:0'>
</pre>