gentoo auto-resync : 03:06:2024 - 00:07:25

4 files changed, 37 insertions, 2 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 91e17d8b9bb7..91dff6076544 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index feb46c5133f5..b8e2e9d359d9 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,6 +1,7 @@
+AUX dolphin-5.0_p20220520-gcc-14.patch 985 BLAKE2B ce23b524350d24bc782a6dc6e247015f451c18a1dd51271b89ba20acd4d44a89f6c09850693fcc7bb625314312f47bfdc692bcda53c6ea8889cdca49d53c1ca1 SHA512 72fa9cd0a919b0d38104d7fc050b11ec63c6caac0424477e57b810240bd0a601ec4884fc71c0d52ab302bb198ae202fd7d6fabe94741efc75e53409979300b88
 AUX dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch 1473 BLAKE2B ce7d9aaf62fc71262600d72442251241353c6280c84d1d08d2986a99330ae22b786983ba3b99484983adf7e7367c094d3f5a7ce1184e94686516c093d3c9957a SHA512 7bbd120fecf9ad18a2fb242d3568da4c013081dbe39045007e82f4ed56a52800d2afeca7263abf785ff023432f0d60cb36b629fb41555b7b39ef56b12fa16aa6
 DIST dolphin-5.0_p20220520.tar.gz 34880474 BLAKE2B 925cddfe8a5d6febced5721bea6ced7c8d2855619f74ca8940b95dc78ea523b4a1083b9ef6efe3561d833b8e9ecb742cb2adf5a1864c06b629b3ecd9e92cc871 SHA512 4993cb10061b142f6627c96493885a5f9d88857d8949c2e8e8d5df5ba6e19b4f98d199da5e641d3d61294884e1cbbe8191bc5b4445c60bf80723046b2524aad5
 DIST mgba-40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz 12921593 BLAKE2B 8c5cf7b9b53f897f6248ad6bc51efafaa8a9d5df137d42d30f4b042b6d1527049644595938626c8cae1385d329bc45bf42db8dcc4424b963a3899e0df53246eb SHA512 26d7b60cbc7415652bb9ca2a42ccd532856867db57bf6dd91d8204551970109b6b9f4a96c42d643ea96b9d071d6aec924d3c1bb79c251c95183b7fb8536456c9
-EBUILD dolphin-5.0_p20220520-r2.ebuild 4890 BLAKE2B 43bbd867b9a1dc69c05a5c3c0fec53737e8dea3b4b6400c4f0fa2dacc1164628329e4041be740faf74171104d6d0f97cf2298841cd251313341e9f89dd2b608f SHA512 ec5c8351fed047565364d7002191dbc03e2123b6ef257be54b0beda73a7d5db659099418392dcc130d0e834ee65268469ddb60aca9a0250537d965b9f28fc67b
+EBUILD dolphin-5.0_p20220520-r2.ebuild 4979 BLAKE2B 30956f88e4adb8674e641afcb4efd7bd6e6aa2fe7615cabe842d56a12b00fa0a1207b600e493de8a68301ad7a8316076b8c647ac1a026f1271d48b2a6bc8ae45 SHA512 d0247e9612c82bdc7222e1183dcc431d1f905802a22a516465cfa8b72d4163f06690a2a1939a6d97055f725a8744f533ff3bff21904c1210e95366ffac530f55
 EBUILD dolphin-9999.ebuild 4829 BLAKE2B a2419c154b9416db0a3dcecbf96440cbbe89ee52eb18834d6fac6c3e3e1d4b3b9e0a3e62ce7b95381f5faea2660b98b596bcf37409a6874da9beb56f012c1ed0 SHA512 0e350f7afb671b1e33afef83410f376abc671847af16b084f12f7aa331679d6b0adb2df53a07b3ebce531a5c1ef6444bb8ab3fe01bbe0150c3415acc2d1ae8f1
 MISC metadata.xml 938 BLAKE2B 07b08890471080d41dd0bbc37bc94e5c9b7d98f2c0cea33c592dea3ccc331f9e6d8ef99cff08350f382c8298111e2d8f811f703562a045cbe853cf12c482ea04 SHA512 91239b346061f8f474880e13c6d3e877a63637d7e56d4c31106e6a17583e0a30db29eec8fe6a711fb033efcec39a7262037e0f7f867459398841b8339d3f6bef
diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild b/games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild
index c1f43ed2cbd5..eb77bc5735c5 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild
@@ -35,7 +35,11 @@ IUSE="
 	profile pulseaudio systemd upnp vulkan
 "
 
-PATCHES=("${FILESDIR}/${P}-libfmt-9.0.0-fix-build.patch")
+PATCHES=(
+	"${FILESDIR}/${P}-libfmt-9.0.0-fix-build.patch"
+	# https://github.com/dolphin-emu/dolphin/pull/12575
+	"${FILESDIR}/${P}-gcc-14.patch"
+)
 
 RDEPEND="
 	app-arch/bzip2:=
diff --git a/games-emulation/dolphin/files/dolphin-5.0_p20220520-gcc-14.patch b/games-emulation/dolphin/files/dolphin-5.0_p20220520-gcc-14.patch
new file mode 100644
index 000000000000..44ffb50ae257
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-5.0_p20220520-gcc-14.patch
@@ -0,0 +1,30 @@
+From 3da2e15e6b95f02f66df461e87c8b896e450fdab Mon Sep 17 00:00:00 2001
+From: Peter Lafreniere <peter@n8pjl.ca>
+Date: Sun, 11 Feb 2024 20:55:31 -0500
+Subject: [PATCH] IOFile: avoid clearing errors on null file struct
+
+When performing a default compilation with recent GCC & glibc,
+the use of -Werror=nonnull causes a build error.
+
+The error is given as IOFile::ClearError() can call std::clearerr()
+with a null file, which can trigger a null-pointer dereference in libc.
+
+Change the std::clearerr() call to be conditional on a file being open.
+---
+ Source/Core/Common/IOFile.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Source/Core/Common/IOFile.h b/Source/Core/Common/IOFile.h
+index 4b12c3188853..b5895333b1be 100644
+--- a/Source/Core/Common/IOFile.h
++++ b/Source/Core/Common/IOFile.h
+@@ -116,7 +116,8 @@ class IOFile
+   void ClearError()
+   {
+     m_good = true;
+-    std::clearerr(m_file);
++    if (IsOpen())
++      std::clearerr(m_file);
+   }
+ 
+ private: