diff --git a/Externals/_Patches/bit7z.patch b/Externals/_Patches/bit7z.patch index 866757f..9700147 100644 --- a/Externals/_Patches/bit7z.patch +++ b/Externals/_Patches/bit7z.patch @@ -19,10 +19,10 @@ index 2541327..c61252b 100644 \ No newline at end of file +} // namespace bit7z diff --git a/src/internal/fileextractcallback.cpp b/src/internal/fileextractcallback.cpp -index 06d7ce3..ed6b26c 100644 +index a34b81a..cede3ca 100644 --- a/src/internal/fileextractcallback.cpp +++ b/src/internal/fileextractcallback.cpp -@@ -91,7 +91,7 @@ auto FileExtractCallback::getOutStream( uint32_t index, ISequentialOutStream** o +@@ -94,7 +94,7 @@ auto FileExtractCallback::getOutStream( uint32_t index, ISequentialOutStream** o #if defined( BIT7Z_USE_NATIVE_STRING ) const auto& filePathString = filePath.native(); #elif !defined( BIT7Z_USE_SYSTEM_CODEPAGE ) @@ -31,10 +31,23 @@ index 06d7ce3..ed6b26c 100644 #else const auto& nativePath = filePath.native(); const auto filePathString = narrow( nativePath.c_str(), nativePath.size() ); -@@ -138,4 +138,4 @@ auto FileExtractCallback::getOutStream( uint32_t index, ISequentialOutStream** o +@@ -141,4 +141,4 @@ auto FileExtractCallback::getOutStream( uint32_t index, ISequentialOutStream** o return S_OK; } -} // namespace bit7z \ No newline at end of file +} // namespace bit7z +diff --git a/src/internal/stringutil.hpp b/src/internal/stringutil.hpp +index 2ac190b..5a21215 100644 +--- a/src/internal/stringutil.hpp ++++ b/src/internal/stringutil.hpp +@@ -40,7 +40,7 @@ inline auto path_to_tstring( const fs::path& path ) -> tstring { + const auto& native_path = path.native(); + return narrow( native_path.c_str(), native_path.size() ); + #else +- return path.u8string(); ++ return path.string(); + #endif + } + diff --git a/Externals/_Patches/libidevice.patch b/Externals/_Patches/libidevice.patch index f2a1873..ed1901e 100644 --- a/Externals/_Patches/libidevice.patch +++ b/Externals/_Patches/libidevice.patch @@ -23,16 +23,3 @@ index f377299..209fa7e 100644 namespace idevice { -diff --git a/include/idevice/instrument/dtxtransport.h b/include/idevice/instrument/dtxtransport.h -index b1fa9b4..07f4897 100644 ---- a/include/idevice/instrument/dtxtransport.h -+++ b/include/idevice/instrument/dtxtransport.h -@@ -220,7 +220,7 @@ class BufferedDTXTransport { - */ - bool Flush() { - if (buffer_used_ == 0) { -- return; // nothing to do -+ return false; // nothing to do - } - uint32_t actual_size = 0; - bool ret = transport_->Send(buffer_, buffer_used_, &actual_size); diff --git a/Externals/_Patches/libnskeyedarchiver.patch b/Externals/_Patches/libnskeyedarchiver.patch deleted file mode 100644 index 350bf80..0000000 --- a/Externals/_Patches/libnskeyedarchiver.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/nskeyedarchiver/common.hpp b/include/nskeyedarchiver/common.hpp -index 9120e89..9f5baca 100644 ---- a/include/nskeyedarchiver/common.hpp -+++ b/include/nskeyedarchiver/common.hpp -@@ -52,7 +52,7 @@ inline void print_plist_as_xml(plist_t node) { - plist_to_xml(node, &xml, &xml_length); - if (xml != nullptr) { - printf("%s\n", xml); -- plist_to_xml_free(xml); -+ plist_mem_free(xml); - } - } - diff --git a/info.json b/info.json index 2cc86f5..c963954 100644 --- a/info.json +++ b/info.json @@ -7,7 +7,7 @@ "project": "libimobiledevice", "url": "https://github.com/libimobiledevice/libimobiledevice", "branch": "master", - "revision": "6fc41f57fc607df9b07446ca45bdf754225c9bd9", + "revision": "04c023317f616b4b9588cce8c2da3174a7d2086b", "path": "Externals/libimobiledevice", "use_submodules": false }, @@ -15,7 +15,7 @@ "project": "libusbmuxd", "url": "https://github.com/libimobiledevice/libusbmuxd", "branch": "master", - "revision": "8d30a559cf0585625d9d05dc8ce0dd495b1de4f4", + "revision": "30e678d4e76a9f4f8a550c34457dab73909bdd92", "path": "Externals/libusbmuxd", "use_submodules": false }, @@ -31,7 +31,7 @@ "project": "libplist", "url": "https://github.com/libimobiledevice/libplist", "branch": "master", - "revision": "2d8d7ef272db06783989f77ba1ed80aa0f4d2dfd", + "revision": "2cd858c679d25633077ca78b67182a9b77653816", "path": "Externals/libplist", "use_submodules": false }, @@ -39,7 +39,7 @@ "project": "libidevice", "url": "https://github.com/sandin/libidevice", "branch": "master", - "revision": "ed003cd84dd207de7377b6ce60fc8b0fecf92cf9", + "revision": "6b594c2eece25baea2757ed04f45febc2069697a", "path": "Externals/libidevice", "use_submodules": false }, @@ -47,7 +47,7 @@ "project": "libnskeyedarchiver", "url": "https://github.com/sandin/libnskeyedarchiver", "branch": "master", - "revision": "afa50c85fdaff9a2cc988bb7572bb09f143b2415", + "revision": "283f5d00c3caaed5feefd7cbe4bf9e08fa3816d3", "path": "Externals/libnskeyedarchiver", "use_submodules": false }, @@ -85,7 +85,7 @@ { "project": "bit7z", "url": "https://github.com/rikyoz/bit7z", - "branch": "v4.0.1", + "branch": "v4.0.4", "path": "Externals/bit7z", "use_submodules": true },