Skip to content

Commit

Permalink
emulators/dolphin-emu: Fix build with upcoming minizip-ng 4.0.4
Browse files Browse the repository at this point in the history
PR:		275303
Reported by:	lbartoletti
  • Loading branch information
martymac committed Feb 14, 2024
1 parent 29a1abb commit 2bb42eb
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
2 changes: 1 addition & 1 deletion emulators/dolphin-emu/Makefile
@@ -1,6 +1,6 @@
PORTNAME= dolphin-emu
PORTVERSION= 5.0.19870
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= emulators

MAINTAINER= martymac@FreeBSD.org
Expand Down
@@ -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);

0 comments on commit 2bb42eb

Please sign in to comment.