nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-21 11:49:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated to current KeePassKit to enable correct builds on Apple Silicon

Browse Source
This commit is contained in:
Michael Starke
2020-11-23 13:52:29 +01:00
parent c4d7025163
commit 381d4b1cac
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cartfile
View File

@@ -1,4 +1,4 @@
github "sparkle-project/Sparkle" ~> 1.22
github "mattt/TransformerKit" ~> 1.1.1
github "MacPass/KeePassKit" "4e928213b2ef3a07dcf0b5d9440459f119f9d2f5"
github "mstarke/HNHUi" ~> 3.0
github "MacPass/KeePassKit" "4993fc9e0f4dc7dc010c7ed9c3c54d9f1484b8f9"
github "mstarke/HNHUi" ~> 4.0

7
Cartfile.resolved
View File

@@ -1,4 +1,5 @@
github "MacPass/KeePassKit" "4e928213b2ef3a07dcf0b5d9440459f119f9d2f5"
github "mstarke/HNHUi" "3.0"
github "MacPass/KeePassKit" "4993fc9e0f4dc7dc010c7ed9c3c54d9f1484b8f9"
github "mattt/TransformerKit" "1.1.1"
github "mstarke/HNHUi" "4.0.2"
github "robbiehanson/KissXML" "5.3.2"
github "sparkle-project/Sparkle" "v1.23.0"
github "sparkle-project/Sparkle" "1.24.0"

2
MacPass.xcodeproj/project.pbxproj
View File

@@ -1853,7 +1853,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = MP;
LastUpgradeCheck = 1210;
LastUpgradeCheck = 1220;
ORGANIZATIONNAME = "HicknHack Software GmbH";
TargetAttributes = {
4C77E36115B84A240093A587 = {

2
MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1210"
LastUpgradeVersion = "1220"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"

8
MacPass/Base.lproj/PasswordInputView.xib
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -73,7 +73,7 @@ DQ
<constraints>
<constraint firstAttribute="width" constant="191" id="389"/>
</constraints>
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Enter Password" drawsBackground="YES" usesSingleLineMode="YES" id="339">
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Enter Password" drawsBackground="YES" usesSingleLineMode="YES" id="339" customClass="HNHUISecureTextFieldCell">
<font key="font" size="13" name="Menlo-Regular"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -93,7 +93,7 @@ DQ
</buttonCell>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="486">
<rect key="frame" x="358" y="220" width="29" height="23"/>
<rect key="frame" x="358" y="221" width="29" height="23"/>
<buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSStopProgressTemplate" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="487">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>