merged xcode sqlite3 fixes Release_2.1 Release_2.1.5
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Wed, 21 Oct 2020 14:03:59 +0200
branchRelease_2.1
changeset 5124bf8ec2f0c15b
parent 5119 cbc28434b2b5
parent 5121 e2ca79a3bbf5
child 5125 a97067dc030c
merged xcode sqlite3 fixes
     1.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Thu Oct 15 09:56:20 2020 +0200
     1.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Wed Oct 21 14:03:59 2020 +0200
     1.3 @@ -171,8 +171,8 @@
     1.4  		431F04B722733A7E00CCE960 /* key_reset.h in Headers */ = {isa = PBXBuildFile; fileRef = 431F04B222733A7E00CCE960 /* key_reset.h */; };
     1.5  		432713B023A10B07007EAD4A /* GroupKeysForNewMember.c in Sources */ = {isa = PBXBuildFile; fileRef = 432713AF23A10B07007EAD4A /* GroupKeysForNewMember.c */; };
     1.6  		432714AB23A10B3B007EAD4A /* GroupKeysUpdate.c in Sources */ = {isa = PBXBuildFile; fileRef = 432714AA23A10B3B007EAD4A /* GroupKeysUpdate.c */; };
     1.7 -		43370833203C075A004E6547 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 4337082D203C075A004E6547 /* sqlite3.c */; };
     1.8 -		43370834203C075A004E6547 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 43370832203C075A004E6547 /* sqlite3.h */; };
     1.9 +		436084242539A3B1005D56A7 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 436084222539A3B0005D56A7 /* sqlite3.c */; };
    1.10 +		436084252539A3B1005D56A7 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 436084232539A3B1005D56A7 /* sqlite3.h */; };
    1.11  		4378C79123D1AF1700D1AF3F /* ElectGroupKeyResetLeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 4378C78B23D1AF1700D1AF3F /* ElectGroupKeyResetLeader.h */; };
    1.12  		4378C79223D1AF1700D1AF3F /* ElectGroupKeyResetLeader.c in Sources */ = {isa = PBXBuildFile; fileRef = 4378C79023D1AF1700D1AF3F /* ElectGroupKeyResetLeader.c */; };
    1.13  		438C43B52167752C00C7425B /* labeled_int_list.h in Headers */ = {isa = PBXBuildFile; fileRef = 438C43AF2167752C00C7425B /* labeled_int_list.h */; };
    1.14 @@ -429,8 +429,8 @@
    1.15  		431F04B222733A7E00CCE960 /* key_reset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = key_reset.h; path = ../src/key_reset.h; sourceTree = "<group>"; };
    1.16  		432713AF23A10B07007EAD4A /* GroupKeysForNewMember.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GroupKeysForNewMember.c; path = ../asn.1/GroupKeysForNewMember.c; sourceTree = "<group>"; };
    1.17  		432714AA23A10B3B007EAD4A /* GroupKeysUpdate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GroupKeysUpdate.c; path = ../asn.1/GroupKeysUpdate.c; sourceTree = "<group>"; };
    1.18 -		4337082D203C075A004E6547 /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../src/sqlite3.c; sourceTree = "<group>"; };
    1.19 -		43370832203C075A004E6547 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = ../src/sqlite3.h; sourceTree = "<group>"; };
    1.20 +		436084222539A3B0005D56A7 /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../../sqlite/sqlite3.c; sourceTree = "<group>"; };
    1.21 +		436084232539A3B1005D56A7 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = ../../sqlite/sqlite3.h; sourceTree = "<group>"; };
    1.22  		4378C78B23D1AF1700D1AF3F /* ElectGroupKeyResetLeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ElectGroupKeyResetLeader.h; path = ../asn.1/ElectGroupKeyResetLeader.h; sourceTree = "<group>"; };
    1.23  		4378C79023D1AF1700D1AF3F /* ElectGroupKeyResetLeader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ElectGroupKeyResetLeader.c; path = ../asn.1/ElectGroupKeyResetLeader.c; sourceTree = "<group>"; };
    1.24  		438C43962167582400C7425B /* sync_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sync_api.h; path = ../src/sync_api.h; sourceTree = "<group>"; };
    1.25 @@ -744,6 +744,8 @@
    1.26  		64A8264B1B455C5600EECAF0 /* srcref */ = {
    1.27  			isa = PBXGroup;
    1.28  			children = (
    1.29 +				436084222539A3B0005D56A7 /* sqlite3.c */,
    1.30 +				436084232539A3B1005D56A7 /* sqlite3.h */,
    1.31  				43C3778D246A8C0300962D22 /* internal_format.c */,
    1.32  				43C37788246A8C0300962D22 /* internal_format.h */,
    1.33  				43188ABE23C4BBDD008EF79C /* distribution_codec.c */,
    1.34 @@ -771,8 +773,6 @@
    1.35  				43F73C052166282C00AB4524 /* key_reset.c */,
    1.36  				43F73C032166282C00AB4524 /* openpgp_compat.c */,
    1.37  				43F73C092166282C00AB4524 /* sync_api.c */,
    1.38 -				4337082D203C075A004E6547 /* sqlite3.c */,
    1.39 -				43370832203C075A004E6547 /* sqlite3.h */,
    1.40  				430BCC472015EE800077E998 /* pEp_string.c */,
    1.41  				430BCC462015EE800077E998 /* pEp_string.h */,
    1.42  				43F6921C1F164A47009418F5 /* resource_id.c */,
    1.43 @@ -894,7 +894,6 @@
    1.44  				15B037C822B2B822002D664C /* ISO639-1.h in Headers */,
    1.45  				15B037C922B2B822002D664C /* xer_decoder.h in Headers */,
    1.46  				43188A9923C4B2DE008EF79C /* Sync_func.h in Headers */,
    1.47 -				43370834203C075A004E6547 /* sqlite3.h in Headers */,
    1.48  				15147EF1237E9EA7003989FE /* GroupHandshake.h in Headers */,
    1.49  				15B037D522B2B822002D664C /* TID.h in Headers */,
    1.50  				15B037AD22B2B822002D664C /* Rollback.h in Headers */,
    1.51 @@ -921,6 +920,7 @@
    1.52  				C46EBAEE216E445F0042A6A3 /* base64.h in Headers */,
    1.53  				15B037F722B2B822002D664C /* per_decoder.h in Headers */,
    1.54  				158FF95F23C49ED600CB1016 /* GroupKeysUpdate.h in Headers */,
    1.55 +				436084252539A3B1005D56A7 /* sqlite3.h in Headers */,
    1.56  				15B037F022B2B822002D664C /* NegotiationOpen.h in Headers */,
    1.57  			);
    1.58  			runOnlyForDeploymentPostprocessing = 0;
    1.59 @@ -1163,7 +1163,6 @@
    1.60  				158FF96123C49ED600CB1016 /* Distribution.c in Sources */,
    1.61  				43F73C0B2166282C00AB4524 /* openpgp_compat.c in Sources */,
    1.62  				15B037F422B2B822002D664C /* ber_decoder.c in Sources */,
    1.63 -				43370833203C075A004E6547 /* sqlite3.c in Sources */,
    1.64  				15B0380122B2B822002D664C /* asn_SET_OF.c in Sources */,
    1.65  				15B037DE22B2B822002D664C /* KeySync.c in Sources */,
    1.66  				15B75BE223FA9F9D00DAE976 /* SynchronizeGroupKeys.c in Sources */,
    1.67 @@ -1180,6 +1179,7 @@
    1.68  				430D258B1C9ED75A00B94535 /* blacklist.c in Sources */,
    1.69  				15B0380E22B2B822002D664C /* PrintableString.c in Sources */,
    1.70  				15B037E922B2B822002D664C /* CommitAcceptOfferer.c in Sources */,
    1.71 +				436084242539A3B1005D56A7 /* sqlite3.c in Sources */,
    1.72  				43188AC023C4BBDE008EF79C /* distribution_codec.c in Sources */,
    1.73  				432713B023A10B07007EAD4A /* GroupKeysForNewMember.c in Sources */,
    1.74  				646C414E1D510D8800C63EFF /* baseprotocol.c in Sources */,