From nobody Tue Jan 14 15:28:56 2025 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 4YXY210LHFz5kp4T; Tue, 14 Jan 2025 15:28:57 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YXY206d97z3qfg; Tue, 14 Jan 2025 15:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736868536; 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=jM6cR9QAtuHLVvLmgfhuN5roM2QGK5yqAcAOn0A8bJs=; b=VPLWoV0HKEfOs37zDdAcdT0Ijughx+VX2Oqn6YKc5FgbZ7C/HjxtXZW2ZHR/QlW+9JYkmM WDkXEaRrE3Vb8fsLToV7UcJ6TMab/6RtKdz36nIvzI5+SCiAa6HFVWfZHGvS8hpv7ML+cM 0bafouIi7EvAc3gm2eHZhlxFHKbA/LbsODZVsnTI+g5fGkB9CJG4Vis+q1BQF+bgEpa2pT fV716Mx2HWsP4gnGylJBtZhb8a7b2oVqyxxh3iZueSoY4OcKypZkpl8BRKVtjSDHm+jNMw eb4CfaWJWm26xK6UN3asHahQKDvxDIUFFZMNRh9bgTVFOL8O1WyRpzNN+ydlYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736868536; 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=jM6cR9QAtuHLVvLmgfhuN5roM2QGK5yqAcAOn0A8bJs=; b=ER6g9K2mTRsN7H7AvZPGKXAMj2kKZwS9RCeFap+Cg3uUKptPrEwinPELkUn5SkcMnr4QKL RRUnmKD6vqJEkM0/IbyxnaSBY+408K+4XA/ikf7sMHTyxW3MZZ08DeqX/MbT3isJmh5VwV rppOkC054BuoTEg6us2rKujlg4gzPzNF396mfxm4TuRieiw0ksh8qUID36/oTCWEaRvhfh rNmW38Vqr3kD5fUU/kpGa8JrjHgVJ3F4XFrnx4LbRkdk5ZWoOISWoZC1/PINj48BInnnDU dTU2yfzEaglX4w40EAJ9pzwugSMnjrqIupqXWroDvJh2QdvVeZPG0yh7NOCWNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736868536; a=rsa-sha256; cv=none; b=dmKCmuW4AKBR3lfSUHIUGf3v5XeiGP9KaKy+mJVsJDXaJ/EeUIC9nKUCHPG4mGLMJn4lou A3L/wqbTAyTjlXuPDovTCgRyzc0Z0cBerYAyibdVzWu2ui24gvkZECaQnSwuAkzvCSaMlL 0aMSp29jgiQPslCdvOew/8kp4+0bccmlUqK3bAcaJSy2qVIyeD2Uo5a5ZCJViuFlK2yJij V/4LaRgfe6kNuKBVOb5Gf1wpw2AxxLkznf6KpSYZgcrFKAPGUtYTUoNgQHvxqxNOrOQieI Z3wIZjyH2RZsgFbPmalfSXrxWTJNkuE3JFzFp4ckv1TzJUVHYbkpJavP7ILiaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YXY206BW4z1Lff; Tue, 14 Jan 2025 15:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50EFSu7R091863; Tue, 14 Jan 2025 15:28:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50EFSurd091860; Tue, 14 Jan 2025 15:28:56 GMT (envelope-from git) Date: Tue, 14 Jan 2025 15:28:56 GMT Message-Id: <202501141528.50EFSurd091860@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 9277ca031e80 - 2025Q1 - emulators/dolphin-emu: Fix build with minizip-ng >= 4.0.8 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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/2025Q1 X-Git-Reftype: branch X-Git-Commit: 9277ca031e80e14fc49fbaf876f728432fc1ec87 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=9277ca031e80e14fc49fbaf876f728432fc1ec87 commit 9277ca031e80e14fc49fbaf876f728432fc1ec87 Author: Ganael LAPLANCHE AuthorDate: 2025-01-14 15:18:47 +0000 Commit: Ganael LAPLANCHE CommitDate: 2025-01-14 15:28:26 +0000 emulators/dolphin-emu: Fix build with minizip-ng >= 4.0.8 (cherry picked from commit 03bee968c1322b7feb691b87e0bee8aa462b7c40) --- emulators/dolphin-emu/files/patch-minizip-ng.txt | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/emulators/dolphin-emu/files/patch-minizip-ng.txt b/emulators/dolphin-emu/files/patch-minizip-ng.txt new file mode 100644 index 000000000000..f29aa06843b4 --- /dev/null +++ b/emulators/dolphin-emu/files/patch-minizip-ng.txt @@ -0,0 +1,38 @@ +Fix build with minizip-ng >= 4.0.8 + +See: https://github.com/zlib-ng/minizip-ng/releases/tag/4.0.8 + +--- Source/Core/DiscIO/VolumeVerifier.cpp.orig 2025-01-14 10:58:28 UTC ++++ Source/Core/DiscIO/VolumeVerifier.cpp +@@ -13,7 +13,7 @@ + #include + + #include +-#include ++#include + #include + + #include "Common/Align.h" +--- Source/Core/Common/MinizipUtil.h.orig 2025-01-14 11:17:08 UTC ++++ Source/Core/Common/MinizipUtil.h +@@ -5,7 +5,7 @@ + + #include + +-#include ++#include + + #include "Common/CommonTypes.h" + #include "Common/ScopeGuard.h" +--- Source/Core/UICommon/ResourcePack/ResourcePack.cpp.orig 2025-01-14 11:19:18 UTC ++++ Source/Core/UICommon/ResourcePack/ResourcePack.cpp +@@ -6,7 +6,8 @@ + #include + #include + +-#include ++#include ++#include + #include + + #include "Common/CommonPaths.h"