From 2b419212a7133add88ebe1ebdd2c5813beaa3deb Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Fri, 30 Dec 2022 15:23:06 -0500 Subject: [PATCH] replace fragmentzip.a with xcodeproj Signed-off-by: Joseph Mattello --- .gitmodules | 3 + AltStore.xcodeproj/project.pbxproj | 77 +++++++++++++++++++++- Dependencies/fragmentzip/libfragmentzip.a | Bin 12472 -> 0 bytes Dependencies/libfragmentzip | 1 + 4 files changed, 79 insertions(+), 2 deletions(-) delete mode 100644 Dependencies/fragmentzip/libfragmentzip.a create mode 160000 Dependencies/libfragmentzip diff --git a/.gitmodules b/.gitmodules index 5e8a821f..e1529c9c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "Dependencies/minimuxer"] path = Dependencies/minimuxer url = https://github.com/jkcoxson/minimuxer +[submodule "Dependencies/libfragmentzip"] + path = Dependencies/libfragmentzip + url = https://github.com/SideStore/libfragmentzip.git diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index 98c462dd..51d36a65 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -35,6 +35,7 @@ B343F883295F7C5D002B1159 /* thread.c in Sources */ = {isa = PBXBuildFile; fileRef = B343F879295F7C5D002B1159 /* thread.c */; }; B343F884295F7C5D002B1159 /* utils.c in Sources */ = {isa = PBXBuildFile; fileRef = B343F87A295F7C5D002B1159 /* utils.c */; }; B343F885295F7C5D002B1159 /* tlv.c in Sources */ = {isa = PBXBuildFile; fileRef = B343F87B295F7C5D002B1159 /* tlv.c */; }; + B343F895295F7FAC002B1159 /* libfragmentzip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B343F894295F7F9B002B1159 /* libfragmentzip.a */; }; B376FE3E29258C8900E18883 /* OSLog+SideStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B376FE3D29258C8900E18883 /* OSLog+SideStore.swift */; }; B3919A52292DBE5400519575 /* ProgressRing.swift in Sources */ = {isa = PBXBuildFile; fileRef = D504F42528AD72C50014BB5D /* ProgressRing.swift */; }; B39575F5284F29E20080B4FF /* Roxas.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B39575F4284F29E20080B4FF /* Roxas.framework */; }; @@ -320,7 +321,6 @@ BFF435D8255CBDAB00DD724F /* ALTApplication+AltStoreApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF435D7255CBDAB00DD724F /* ALTApplication+AltStoreApp.swift */; }; BFF615A82510042B00484D3B /* AltStoreCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF66EE7E2501AE50007EE018 /* AltStoreCore.framework */; }; D533E8B72727841800A9B5DD /* libAppleArchive.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D533E8B62727841800A9B5DD /* libAppleArchive.tbd */; settings = {ATTRIBUTES = (Weak, ); }; }; - D533E8BC2727BBEE00A9B5DD /* libfragmentzip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D533E8BB2727BBEE00A9B5DD /* libfragmentzip.a */; }; D533E8BE2727BBF800A9B5DD /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D533E8BD2727BBF800A9B5DD /* libcurl.a */; }; D55E163728776CB700A627A1 /* ComplicationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55E163528776CB000A627A1 /* ComplicationView.swift */; }; D57DF638271E32F000677701 /* PatchApp.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D57DF637271E32F000677701 /* PatchApp.storyboard */; }; @@ -414,6 +414,34 @@ remoteGlobalIDString = CA60C44C93D7A30E3695DD59; remoteInfo = "em_proxy-staticlib"; }; + B343F88D295F7F9B002B1159 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = B343F886295F7F9B002B1159 /* libfragmentzip.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 87B8C3401E0E9C37002F817D; + remoteInfo = "fragmentzip-cli-macOS"; + }; + B343F88F295F7F9B002B1159 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = B343F886295F7F9B002B1159 /* libfragmentzip.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B315FDB02866CCF8002E243C; + remoteInfo = "fragmentzip-cli-iOS"; + }; + B343F891295F7F9B002B1159 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = B343F886295F7F9B002B1159 /* libfragmentzip.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B315FDB52866CD91002E243C; + remoteInfo = "fragmentzip-macOS"; + }; + B343F893295F7F9B002B1159 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = B343F886295F7F9B002B1159 /* libfragmentzip.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B315FDCE2866CDD3002E243C; + remoteInfo = "fragmentzip-iOS"; + }; BF66EE832501AE50007EE018 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFD247622284B9A500981D42 /* Project object */; @@ -491,6 +519,7 @@ B343F879295F7C5D002B1159 /* thread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = thread.c; sourceTree = ""; }; B343F87A295F7C5D002B1159 /* utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utils.c; sourceTree = ""; }; B343F87B295F7C5D002B1159 /* tlv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tlv.c; sourceTree = ""; }; + B343F886295F7F9B002B1159 /* libfragmentzip.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libfragmentzip.xcodeproj; path = Dependencies/libfragmentzip/libfragmentzip.xcodeproj; sourceTree = ""; }; B376FE3D29258C8900E18883 /* OSLog+SideStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OSLog+SideStore.swift"; sourceTree = ""; }; B39575F4284F29E20080B4FF /* Roxas.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Roxas.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B39F16122918D7C5002E9404 /* Consts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Consts.swift; sourceTree = ""; }; @@ -870,6 +899,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B343F895295F7FAC002B1159 /* libfragmentzip.a in Frameworks */, 191E6087290C7B50001A3B7C /* libminimuxer.a in Frameworks */, 191E5FB4290A5DA0001A3B7C /* libminimuxer.a in Frameworks */, 19104DBC2909C4E500C49C7B /* libEmotionalDamage.a in Frameworks */, @@ -882,7 +912,6 @@ B3C395F4284F35DD00DA9E2F /* Nuke in Frameworks */, BF1614F1250822F100767AEA /* Roxas.framework in Frameworks */, B3C395F7284F362400DA9E2F /* AppCenterAnalytics in Frameworks */, - D533E8BC2727BBEE00A9B5DD /* libfragmentzip.a in Frameworks */, BF66EE852501AE50007EE018 /* AltStoreCore.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -954,6 +983,17 @@ name = Products; sourceTree = ""; }; + B343F887295F7F9B002B1159 /* Products */ = { + isa = PBXGroup; + children = ( + B343F88E295F7F9B002B1159 /* libfragmentzip */, + B343F890295F7F9B002B1159 /* libfragmentzip */, + B343F892295F7F9B002B1159 /* libfragmentzip.a */, + B343F894295F7F9B002B1159 /* libfragmentzip.a */, + ); + name = Products; + sourceTree = ""; + }; B39F16112918D7B5002E9404 /* Consts */ = { isa = PBXGroup; children = ( @@ -1443,6 +1483,7 @@ BF98916C250AABF3002ACF50 /* AltWidget */, 19104DB32909C06D00C49C7B /* EmotionalDamage */, 191E5FAC290A5D92001A3B7C /* minimuxer */, + B343F886295F7F9B002B1159 /* libfragmentzip.xcodeproj */, BFD247852284BB3300981D42 /* Frameworks */, B3146EC6284F580500BBC3FD /* Roxas.xcodeproj */, BFD2476B2284B9A500981D42 /* Products */, @@ -1991,6 +2032,10 @@ ProductGroup = B343F84E295F6323002B1159 /* Products */; ProjectRef = B343F84D295F6323002B1159 /* em_proxy.xcodeproj */; }, + { + ProductGroup = B343F887295F7F9B002B1159 /* Products */; + ProjectRef = B343F886295F7F9B002B1159 /* libfragmentzip.xcodeproj */; + }, { ProductGroup = B343F848295F6321002B1159 /* Products */; ProjectRef = B343F847295F6321002B1159 /* minimuxer.xcodeproj */; @@ -2057,6 +2102,34 @@ remoteRef = B343F854295F6323002B1159 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + B343F88E295F7F9B002B1159 /* libfragmentzip */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = libfragmentzip; + remoteRef = B343F88D295F7F9B002B1159 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B343F890295F7F9B002B1159 /* libfragmentzip */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = libfragmentzip; + remoteRef = B343F88F295F7F9B002B1159 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B343F892295F7F9B002B1159 /* libfragmentzip.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libfragmentzip.a; + remoteRef = B343F891295F7F9B002B1159 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B343F894295F7F9B002B1159 /* libfragmentzip.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libfragmentzip.a; + remoteRef = B343F893295F7F9B002B1159 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ diff --git a/Dependencies/fragmentzip/libfragmentzip.a b/Dependencies/fragmentzip/libfragmentzip.a deleted file mode 100644 index 36383620f57cfc0a690cde44e4f3dd7b1d667e9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12472 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 mw$^TQ>D=OY3JLIw