From nobody Wed Feb 14 15:05:19 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TZhMM4sXMz5B5nj; Wed, 14 Feb 2024 15:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZhMM4KMYz3wqn; Wed, 14 Feb 2024 15:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707923119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uW4Ea7JukbpPLgOc54GrFqiG1yTM8qsbnqA04rn5F98=; b=iDnn2G9TOSOhguHg2HA2F1GVkrM8xJf8vPFfW5JbBdHIatvclAJI6x4TUi0/zwrP2TGxEQ rkxcrIH2ysyNGzsU0E0gZglvxy3t0zSXgjCnLgOi1QO+jkkMBEmM/OklPPX+YJp6jrnMEn fM2EyqFIvIqA4sfLXiEXDMYl9yLLcUx9iZsekIsaEVm8drvvCZEUF1S3Oj/kbx1fYSAtA7 CZodQSbjvHU0dRZKnicqu6Kox7gByS4v+ZLAIPo5/5NcMM0Y+JXUiVatBMhoTwx3Jr/liN Cd3S0X6jZLiVGViQ4DO6sn+1WFZe/K1Sbf6odahzrKk/eIiNyu5MkEMBAo5iLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707923119; a=rsa-sha256; cv=none; b=uIQmglcq+sog5t/GAjaj+ZnAh+i1DUcxcb39UCgTMxonkK5wGqkMWbjpecm0pGCKJRQmN/ XOWdYI2HRB0SulqvMEbRz5LkpSJot2JFHp//pgWaVRyCAVTmTuJRKj9zq3xLcMkNBtrgSH LT8l2G7nxXJONS80Oyz8FXZK31xbXGpoY+i+PQvhcU/tU2cDlJN4o84uj9dEbhYbniS/Rk xTRtDfMBUBoldq8XxGb7YGlU27VlzopWP9SMSPoygcDnjwcbVSNJzwJQy153h+HY881IuD 6+PLXgnNBzuYAwf4xlKmZ7iFnfRROsGc5PttdYUur2xpqtjphPnlc+0PPUnr1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707923119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uW4Ea7JukbpPLgOc54GrFqiG1yTM8qsbnqA04rn5F98=; b=wbOSwfoAhtFctL93gnQp9L8rJ8BtJGMmalhHjI7szJLunNvJTjlxXL12yoBp1o56sxxesf zHB4bGLh1hMW8LkW7d6/n44a4vQd8fVux5kaJ+6+st/uhdPJc5Slb7mProDfcJ5Pq7ocFI TrYhUqcYHQVdVmSl6ROMX8TBSyej/8vEw+nORQv1NCF0kmk7HLJV9Imyxc2vlWuawyonNM m2yUbGr+MiidPBD8Xbrqp0IoU8tWxvXP28H/6+glYCtfajh3XapydENX/N3lW2TguD5CV4 XfK22LX72Jr49vmkY8sEVr7LKQZLLMkMt7/QBKl3RTUPvzn4lAPCz8wD2jHS2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZhMM3FKrz12nW; Wed, 14 Feb 2024 15:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41EF5Jgn097552; Wed, 14 Feb 2024 15:05:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EF5JkW097549; Wed, 14 Feb 2024 15:05:19 GMT (envelope-from git) Date: Wed, 14 Feb 2024 15:05:19 GMT Message-Id: <202402141505.41EF5JkW097549@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 2bb42eb19eff - main - emulators/dolphin-emu: Fix build with upcoming minizip-ng 4.0.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2bb42eb19eff8bd5b5b5333f6341dbe3d0a038f3 Auto-Submitted: auto-generated The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=2bb42eb19eff8bd5b5b5333f6341dbe3d0a038f3 commit 2bb42eb19eff8bd5b5b5333f6341dbe3d0a038f3 Author: Ganael LAPLANCHE AuthorDate: 2024-02-14 15:02:31 +0000 Commit: Ganael LAPLANCHE CommitDate: 2024-02-14 15:02:31 +0000 emulators/dolphin-emu: Fix build with upcoming minizip-ng 4.0.4 PR: 275303 Reported by: lbartoletti --- emulators/dolphin-emu/Makefile | 2 +- ...rce-Core-UICommon-ResourcePack-ResourcePack.cpp | 27 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile index 1f04bf857124..380bcce10f56 100644 --- a/emulators/dolphin-emu/Makefile +++ b/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 diff --git a/emulators/dolphin-emu/files/patch-Source-Core-UICommon-ResourcePack-ResourcePack.cpp b/emulators/dolphin-emu/files/patch-Source-Core-UICommon-ResourcePack-ResourcePack.cpp new file mode 100644 index 000000000000..9fe416ad0830 --- /dev/null +++ b/emulators/dolphin-emu/files/patch-Source-Core-UICommon-ResourcePack-ResourcePack.cpp @@ -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);