commit:     b081f691a861628da5a9cbb59ca726108fc5e499
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 22:37:49 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 23:44:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b081f691

games-emulation/pcsx2: drop unnecessary patch

Ended up using -Werror=strict-prototypes to test things, but as far
as I'm aware this shouldn't be "needed" with clang16 either unless
something passes that -Werror. Should still get fixed upstream but
want less patches to manage here. Will revisit if needed.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../pcsx2/files/pcsx2-1.7.3329-clang16.patch          | 19 -------------------
 games-emulation/pcsx2/pcsx2-1.7.3329.ebuild           |  1 -
 games-emulation/pcsx2/pcsx2-9999.ebuild               |  1 -
 3 files changed, 21 deletions(-)

diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch 
b/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch
deleted file mode 100644
index 331101ed6a1c..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/870412
---- a/3rdparty/cpuinfo/src/api.c
-+++ b/3rdparty/cpuinfo/src/api.c
-@@ -78 +78 @@
--const struct cpuinfo_uarch_info* cpuinfo_get_uarchs() {
-+const struct cpuinfo_uarch_info* cpuinfo_get_uarchs(void) {
---- a/cmake/FindPCAP.cmake
-+++ b/cmake/FindPCAP.cmake
-@@ -47 +47 @@
--check_c_source_compiles("int main() { return 0; }" PCAP_LINKS_SOLO)
-+check_c_source_compiles("int main(void) { return 0; }" PCAP_LINKS_SOLO)
-@@ -55 +55 @@
--              check_c_source_compiles("int main() { return 0; }" 
PCAP_NEEDS_THREADS)
-+              check_c_source_compiles("int main(void) { return 0; }" 
PCAP_NEEDS_THREADS)
---- a/tests/ctest/CMakeLists.txt
-+++ b/tests/ctest/CMakeLists.txt
-@@ -20 +20 @@
--      int main() {
-+      int main(void) {

diff --git a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild 
b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
index b5e09ffc395f..6dd06cea5dcb 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
@@ -81,7 +81,6 @@ FILECAPS=(
 
 PATCHES=(
        "${FILESDIR}"/${PN}-1.7.0-crcs.patch
-       "${FILESDIR}"/${PN}-1.7.3329-clang16.patch
        "${FILESDIR}"/${PN}-1.7.3329-lto.patch
        "${FILESDIR}"/${PN}-1.7.3329-musl.patch
        "${FILESDIR}"/${PN}-1.7.3329-qt6.patch

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild 
b/games-emulation/pcsx2/pcsx2-9999.ebuild
index bbe944648d41..f84ec7bab70e 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -81,7 +81,6 @@ FILECAPS=(
 
 PATCHES=(
        "${FILESDIR}"/${PN}-1.7.0-crcs.patch
-       "${FILESDIR}"/${PN}-1.7.3329-clang16.patch
        "${FILESDIR}"/${PN}-1.7.3329-lto.patch
        "${FILESDIR}"/${PN}-1.7.3329-musl.patch
        "${FILESDIR}"/${PN}-1.7.3329-qt6.patch

Reply via email to