From 381d4b1cac59d9126454173fa679b4f09b2becea Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Mon, 23 Nov 2020 13:52:29 +0100
Subject: [PATCH] Updated to current KeePassKit to enable correct builds on
 Apple Silicon

---
 Cartfile                                                  | 4 ++--
 Cartfile.resolved                                         | 7 ++++---
 MacPass.xcodeproj/project.pbxproj                         | 2 +-
 MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme | 2 +-
 MacPass/Base.lproj/PasswordInputView.xib                  | 8 ++++----
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Cartfile b/Cartfile
index b8dd63ae..c9a0cfdb 100644
--- a/Cartfile
+++ b/Cartfile
@@ -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
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 852112ec..391057b8 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -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"
diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index f1e847af..4eda3212 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -1853,7 +1853,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = MP;
-				LastUpgradeCheck = 1210;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = "HicknHack Software GmbH";
 				TargetAttributes = {
 					4C77E36115B84A240093A587 = {
diff --git a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
index 6e82ab6a..fc72d024 100644
--- a/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
+++ b/MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1220"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MacPass/Base.lproj/PasswordInputView.xib b/MacPass/Base.lproj/PasswordInputView.xib
index 9606084d..750809cd 100644
--- a/MacPass/Base.lproj/PasswordInputView.xib
+++ b/MacPass/Base.lproj/PasswordInputView.xib
@@ -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"/>