-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MacVim: Update to version 8.1.snapshot166
- Add Python 3.8 Variant - Remove GCC Version patch - Update Homebrew Python patch - Update Sparkle patch Closes: https://trac.macports.org/ticket/60242
- Loading branch information
Showing
4 changed files
with
74 additions
and
131 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,95 +1,52 @@ | ||
| --- src/MacVim/English.lproj/Preferences.nib/designable.nib 2018-12-12 12:45:19.000000000 +0100 | ||
| +++ src/MacVim/English.lproj/Preferences.nib/designable.nib 2018-12-27 15:38:28.000000000 +0100 | ||
| @@ -75,28 +75,6 @@ | ||
| <binding destination="58" name="selectedTag" keyPath="values.MMOpenLayout" id="441"/> | ||
| </connections> | ||
| </popUpButton> | ||
| - <textField verticalHuggingPriority="750" id="124"> | ||
| - <rect key="frame" x="17" y="209" width="187" height="17"/> | ||
| - <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> | ||
| - <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="When MacVim launches:" id="976"> | ||
| - <font key="font" metaFont="system"/> | ||
| - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> | ||
| - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> | ||
| - </textFieldCell> | ||
| - </textField> | ||
| - <button id="122"> | ||
| - <rect key="frame" x="207" y="208" 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> | ||
| - <buttonCell key="cell" type="check" title="Check for updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="975"> | ||
| - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> | ||
| - <font key="font" metaFont="system"/> | ||
| - </buttonCell> | ||
| - <connections> | ||
| - <action selector="checkForUpdatesChanged:" target="-2" id="YjS-ig-M1j"/> | ||
| - <binding destination="58" name="value" keyPath="values.SUCheckAtStartup" id="169"/> | ||
| - </connections> | ||
| - </button> | ||
| <textField verticalHuggingPriority="750" id="121"> | ||
| <rect key="frame" x="209" y="50" width="243" height="58"/> | ||
| <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/> | ||
| --- src/MacVim/MacVim.xcodeproj/project.pbxproj 2019-12-29 01:02:12.000000000 +0100 | ||
| +++ src/MacVim/MacVim.xcodeproj/project.pbxproj 2019-12-29 01:02:12.000000000 +0100 | ||
| @@ -66,8 +66,6 @@ | ||
| 1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; }; | ||
| 52818B031C1C08CE00F59085 /* QLStephen.qlgenerator in Copy QuickLookPlugin */ = {isa = PBXBuildFile; fileRef = 52818AFF1C1C075300F59085 /* QLStephen.qlgenerator */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; | ||
| 528DA66A1426D4F9003380F1 /* macvim-askpass in Copy Scripts */ = {isa = PBXBuildFile; fileRef = 528DA6691426D4EB003380F1 /* macvim-askpass */; }; | ||
| - 52A364731C4A5789005757EC /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52A364721C4A5789005757EC /* Sparkle.framework */; }; | ||
| - 52A364761C4A57C1005757EC /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 52A364721C4A5789005757EC /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; | ||
| 52B7ED9B1C4A4D6900AFFF15 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 52B7ED9A1C4A4D6900AFFF15 /* dsa_pub.pem */; }; | ||
| 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; }; | ||
| 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; | ||
| @@ -124,7 +122,6 @@ | ||
| dstPath = ""; | ||
| dstSubfolderSpec = 10; | ||
| files = ( | ||
| - 52A364761C4A57C1005757EC /* Sparkle.framework in Copy Frameworks */, | ||
| 1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */, | ||
| ); | ||
| name = "Copy Frameworks"; | ||
| @@ -250,7 +247,6 @@ | ||
| 32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacVim_Prefix.pch; sourceTree = "<group>"; }; | ||
| 52818AFA1C1C075300F59085 /* QuickLookStephen.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = QuickLookStephen.xcodeproj; path = qlstephen/QuickLookStephen.xcodeproj; sourceTree = "<group>"; }; | ||
| 528DA6691426D4EB003380F1 /* macvim-askpass */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "macvim-askpass"; sourceTree = "<group>"; }; | ||
| - 52A364721C4A5789005757EC /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; }; | ||
| 52B7ED9A1C4A4D6900AFFF15 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; }; | ||
| 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; | ||
| 8D1107320486CEB800E47090 /* MacVim.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacVim.app; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
| @@ -395,7 +391,6 @@ | ||
| 1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */, | ||
| 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, | ||
| 1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */, | ||
| - 52A364731C4A5789005757EC /* Sparkle.framework in Frameworks */, | ||
| ); | ||
| runOnlyForDeploymentPostprocessing = 0; | ||
| }; | ||
| @@ -575,7 +570,6 @@ | ||
| 29B97323FDCFA39411CA2CEA /* Frameworks */ = { | ||
| isa = PBXGroup; | ||
| children = ( | ||
| - 52A364721C4A5789005757EC /* Sparkle.framework */, | ||
| 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */, | ||
| 1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */, | ||
| 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */, | ||
| --- src/MacVim/English.lproj/MainMenu.nib/designable.nib 2019-10-30 12:33:12.000000000 +0100 | ||
| +++ src/MacVim/English.lproj/MainMenu.nib/designable.nib 2019-12-29 01:07:47.000000000 +0100 | ||
| @@ -24,11 +24,6 @@ | ||
| <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/> | ||
| </connections> | ||
| </menuItem> | ||
| - <menuItem title="Check for Updates…" id="255"> | ||
| --- src/MacVim/English.lproj/Preferences.nib/designable.nib 2020-09-15 01:22:03.000000000 -0500 | ||
| +++ src/MacVim/English.lproj/Preferences.nib/designable.nib 2020-09-15 01:36:27.000000000 -0500 | ||
| @@ -180,49 +180,6 @@ | ||
| </popUpButton> | ||
| </subviews> | ||
| </customView> | ||
| - <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0hT-y8-Hge" userLabel="Updater"> | ||
| - <rect key="frame" x="19" y="22" width="444" height="36"/> | ||
| - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | ||
| - <subviews> | ||
| - <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="122"> | ||
| - <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> | ||
| - <buttonCell key="cell" type="check" title="Check for updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="975"> | ||
| - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> | ||
| - <font key="font" metaFont="system"/> | ||
| - </buttonCell> | ||
| - <connections> | ||
| - <action selector="checkForUpdatesChanged:" target="-2" id="YjS-ig-M1j"/> | ||
| - <binding destination="58" name="value" keyPath="values.SUCheckAtStartup" id="169"/> | ||
| - </connections> | ||
| - </button> | ||
| - <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UYM-W0-Kgl" userLabel="Auto-install updates"> | ||
| - <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> | ||
| - <buttonCell key="cell" type="check" title="Automatically install updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="GfP-vg-mec"> | ||
| - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> | ||
| - <font key="font" metaFont="system"/> | ||
| - <connections> | ||
| - <action selector="checkForUpdates:" target="Jqk-qh-n0J" id="Wau-rL-cbn"/> | ||
| - <binding destination="58" name="enabled" keyPath="values.SUCheckAtStartup" id="5oY-Gf-XJN"/> | ||
| - </connections> | ||
| - </menuItem> | ||
| <menuItem isSeparatorItem="YES" id="196"> | ||
| <modifierMask key="keyEquivalentModifierMask" command="YES"/> | ||
| </menuItem> | ||
| @@ -208,6 +203,5 @@ | ||
| </items> | ||
| <point key="canvasLocation" x="139" y="67"/> | ||
| </menu> | ||
| - <customObject id="Jqk-qh-n0J" customClass="SUUpdater"/> | ||
| </objects> | ||
| </document> | ||
| - </buttonCell> | ||
| - <connections> | ||
| - <binding destination="58" name="value" keyPath="values.SUAutomaticallyUpdate" id="kyZ-ah-zKf"/> | ||
| - </connections> | ||
| - </button> | ||
| - <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="124"> | ||
| - <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"> | ||
| - <font key="font" metaFont="system"/> | ||
| - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> | ||
| - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> | ||
| - </textFieldCell> | ||
| - </textField> | ||
| - </subviews> | ||
| - </customView> | ||
| </subviews> | ||
| <point key="canvasLocation" x="137.5" y="382"/> | ||
| </customView> |