Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
emulators/dolphin-emu: Fix build with upcoming minizip-ng 4.0.4
PR: 275303 Reported by: lbartoletti
- Loading branch information
Showing
2 changed files
with
28 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
emulators/dolphin-emu/files/patch-Source-Core-UICommon-ResourcePack-ResourcePack.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
Fix build with minizip-ng 4.0.4 | ||
|
||
Source/Core/UICommon/ResourcePack/ResourcePack.cpp:39:7: error: no matching function for call to 'unzLocateFile' | ||
(no known conversion from 'std::nullptr_t' to 'unzFileNameCase' (aka 'int') for 3rd argument) | ||
|
||
This partially reverts upstream commit a5d06fd. | ||
|
||
--- Source/Core/UICommon/ResourcePack/ResourcePack.cpp.orig 2023-07-23 02:24:09 UTC | ||
+++ Source/Core/UICommon/ResourcePack/ResourcePack.cpp | ||
@@ -36,7 +36,7 @@ ResourcePack::ResourcePack(const std::string& path) : | ||
return; | ||
} | ||
|
||
- if (unzLocateFile(file, "manifest.json", nullptr) == UNZ_END_OF_LIST_OF_FILE) | ||
+ if (unzLocateFile(file, "manifest.json", 0) == UNZ_END_OF_LIST_OF_FILE) | ||
{ | ||
m_valid = false; | ||
m_error = "Resource pack is missing a manifest."; | ||
@@ -63,7 +63,7 @@ ResourcePack::ResourcePack(const std::string& path) : | ||
return; | ||
} | ||
|
||
- if (unzLocateFile(file, "logo.png", nullptr) != UNZ_END_OF_LIST_OF_FILE) | ||
+ if (unzLocateFile(file, "logo.png", 0) != UNZ_END_OF_LIST_OF_FILE) | ||
{ | ||
unz_file_info64 logo_info{}; | ||
unzGetCurrentFileInfo64(file, &logo_info, nullptr, 0, nullptr, 0, nullptr, 0); |