Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vim,Macvim: update vim to 9.1.1128, MacVim to r181 #27855

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

vim,Macvim: update vim to 9.1.1128, MacVim to r181 #27855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions editors/MacVim/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4

Check warning on line 1 in editors/MacVim/Portfile

View workflow job for this annotation

GitHub Actions / macos-14 

port test MacVim:
Warning: MacVim is configured to build for the architecture(s) 'arm64', but installed Mach-O files built for the following archs:
Warning: arm64,x86_64:
Warning:   /Applications/MacPorts/MacVim.app/Contents/Frameworks/Sparkle.framework/Versions/B/Autoupdate
Warning:   /Applications/MacPorts/MacVim.app/Contents/Frameworks/Sparkle.framework/Versions/B/Sparkle
Warning:   /Applications/MacPorts/MacVim.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/MacOS/Updater
Warning:

Check warning on line 1 in editors/MacVim/Portfile

View workflow job for this annotation

GitHub Actions / macos-15 

port test MacVim:
Warning: MacVim is configured to build for the architecture(s) 'arm64', but installed Mach-O files built for the following archs:
Warning: arm64,x86_64:
Warning:   /Applications/MacPorts/MacVim.app/Contents/Frameworks/Sparkle.framework/Versions/B/Autoupdate
Warning:   /Applications/MacPorts/MacVim.app/Contents/Frameworks/Sparkle.framework/Versions/B/Sparkle
Warning:   /Applications/MacPorts/MacVim.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/MacOS/Updater
Warning:

Check warning on line 1 in editors/MacVim/Portfile

View workflow job for this annotation

GitHub Actions / macos-13 

port test MacVim:
Warning: MacVim is configured to build for the architecture(s) 'x86_64', but installed Mach-O files built for the following archs:
Warning: arm64,x86_64:
Warning:   /Applications/MacPorts/MacVim.app/Contents/Frameworks/Sparkle.framework/Versions/B/Autoupdate
Warning:   /Applications/MacPorts/MacVim.app/Contents/Frameworks/Sparkle.framework/Versions/B/Sparkle
Warning:   /Applications/MacPorts/MacVim.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/MacOS/Updater
Warning:

PortSystem 1.0
PortGroup github 1.0
Expand All @@ -8,15 +8,13 @@
# is because they both share the same set of configuration files and ensures
# that the user's configuration files will always work with both.
set vim_version 9.1
set release 180
set release 181
github.setup macvim-dev macvim ${release} release-
# Change github.tarball_from to 'releases' or 'archive' next update
github.tarball_from tarball
github.tarball_from archive
revision 0
name MacVim
version ${vim_version}.release${release}
categories editors
platforms darwin
license Vim GPL-2+
maintainers {raimue @raimue}

Expand All @@ -27,9 +25,9 @@

homepage https://macvim.org

checksums rmd160 fb34366d9059f09ef73a56dd215ff504951cad42 \
sha256 bcc84a691ab2344942b18d2dbedd20aab4ecd4d6ac928ac8842f6d1b0c7d70f7 \
size 25822029
checksums rmd160 6f0b0cb3de5781073848e22681c248859129add3 \
sha256 ee4127ff18f55f04b69e401fc444c94b9e4d2bf60580ed18e85b78f2e34efbd3 \
size 27772511

depends_lib-append port:gettext \
port:libiconv \
Expand Down
6 changes: 3 additions & 3 deletions editors/MacVim/files/patch-python.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- src/configure.ac 2021-04-05 15:12:39.000000000 +0200
+++ src/configure.ac 2021-04-05 15:12:49.000000000 +0200
@@ -1429,7 +1429,7 @@
@@ -1477,7 +1477,7 @@
@echo "python_SYSLIBS='$(SYSLIBS)'"
@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
@echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
Expand All @@ -9,7 +9,7 @@
@echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
@echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
@echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
@@ -1437,13 +1437,6 @@
@@ -1485,13 +1485,6 @@
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}"
Expand All @@ -23,7 +23,7 @@
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
@@ -1467,7 +1460,6 @@
@@ -1515,7 +1508,6 @@
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//`
Expand Down
14 changes: 7 additions & 7 deletions editors/MacVim/files/patch-remove-updater.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
@@ -212,66 +208,6 @@
@@ -216,66 +212,6 @@
</textField>
</subviews>
</customView>
Expand All @@ -47,7 +47,7 @@
- <binding destination="58" name="value" keyPath="values.MMShowWhatsNewOnStartup" id="LjF-Lv-00h"/>
- </connections>
- </button>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="qpS-3j-8OG">
- <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="qpS-3j-8OG">
- <rect key="frame" x="-2" y="0.0" width="187" height="17"/>
- <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
- <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="When MacVim launches:" id="S5x-il-vbq">
Expand Down Expand Up @@ -93,9 +93,9 @@
- </subviews>
- </customView>
</subviews>
<point key="canvasLocation" x="137.5" y="-27"/>
<point key="canvasLocation" x="137.5" y="-17"/>
</customView>
@@ -558,17 +494,6 @@
@@ -663,17 +599,6 @@
<rect key="frame" x="0.0" y="0.0" width="483" height="367"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
Expand All @@ -110,14 +110,14 @@
- <binding destination="58" name="value" keyPath="values.MMUpdaterPrereleaseChannel" id="Kb1-yL-bmN"/>
- </connections>
- </button>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="826">
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="826">
<rect key="frame" x="18" y="218" width="449" height="56"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -633,16 +558,6 @@
@@ -738,16 +663,6 @@
<binding destination="58" name="value" keyPath="values.MMUseInlineIm" id="1016"/>
</connections>
</button>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="ere-oJ-WLd">
- <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="ere-oJ-WLd">
- <rect key="frame" x="19" y="20" width="449" height="70"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="Gdp-Ib-RGS">
Expand Down
4 changes: 2 additions & 2 deletions editors/MacVim/files/patch-tcl.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- src/configure.ac 2021-04-05 15:12:49.000000000 +0200
+++ src/configure.ac 2021-04-05 15:17:45.000000000 +0200
@@ -2023,14 +2015,7 @@
@@ -2108,14 +2108,7 @@
tcldll=`echo 'puts libtcl[[info tclversion]][[info sharedlibextension]]' | $vi_cv_path_tcl -`

AC_MSG_CHECKING(for location of Tcl include)
Expand All @@ -16,7 +16,7 @@
TCL_INC=
for try in $tclinc; do
if test -f "$try/tcl.h"; then
@@ -2045,16 +2030,8 @@
@@ -2130,16 +2123,8 @@
fi
if test -z "$SKIP_TCL"; then
AC_MSG_CHECKING(for location of tclConfig.sh script)
Expand Down
11 changes: 5 additions & 6 deletions editors/vim/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4

Check warning on line 1 in editors/vim/Portfile

View workflow job for this annotation

GitHub Actions / macos-14 

port lint vim:
Warning: Variant x11 overrides global description

Check warning on line 1 in editors/vim/Portfile

View workflow job for this annotation

GitHub Actions / macos-15 

port lint vim:
Warning: Variant x11 overrides global description

Check warning on line 1 in editors/vim/Portfile

View workflow job for this annotation

GitHub Actions / macos-13 

port lint vim:
Warning: Variant x11 overrides global description

PortSystem 1.0
PortGroup github 1.0
Expand All @@ -7,10 +7,9 @@
# is because they both share the same set of configuration files and ensures
# that the user's configuration files will always work with both.
set vim_version 9.1
set vim_patchlevel 0727
set vim_patchlevel 1128
github.setup vim vim ${vim_version}.${vim_patchlevel} v
# Change github.tarball_from to 'releases' or 'archive' next update
github.tarball_from tarball
github.tarball_from archive
revision 0
categories editors
platforms darwin freebsd
Expand All @@ -24,9 +23,9 @@

homepage https://www.vim.org

checksums rmd160 862555466b868c9d99943f29d9384c440c67711e \
sha256 dfc41f36c2415acc00d1faef5e50d053be3c5a50b0c569d8ac4c73820be7c731 \
size 18094755
checksums rmd160 c7ae828d37e0094e88bd3578ccd3ea65f9d3368c \
sha256 0c1758ce4201d46683821126d23e4a07b7880033337e2461a4ed688304fe58b1 \
size 18490162

depends_lib-append port:gettext \
port:libiconv \
Expand Down