From 945021e9f79c8a7d1c443f2c472c883db3b877f0 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 18 Apr 2023 07:36:02 +0100 Subject: [PATCH] dev-cpp/rapidfuzz-cpp: fix build w/ gcc 13 Closes: https://bugs.gentoo.org/895696 Signed-off-by: Sam James --- .../files/rapidfuzz-cpp-1.11.2-gcc13.patch | 22 +++++++++++++++++++ .../rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 dev-cpp/rapidfuzz-cpp/files/rapidfuzz-cpp-1.11.2-gcc13.patch diff --git a/dev-cpp/rapidfuzz-cpp/files/rapidfuzz-cpp-1.11.2-gcc13.patch b/dev-cpp/rapidfuzz-cpp/files/rapidfuzz-cpp-1.11.2-gcc13.patch new file mode 100644 index 0000000000000..c3e8117d22e30 --- /dev/null +++ b/dev-cpp/rapidfuzz-cpp/files/rapidfuzz-cpp-1.11.2-gcc13.patch @@ -0,0 +1,22 @@ +https://github.com/maxbachmann/rapidfuzz-cpp/pull/102 + +From f3c691bd8a0659ac3acb7510dab5a536f4d41e1b Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 18 Apr 2023 07:33:39 +0100 +Subject: [PATCH] Fix build with GCC 13 + +GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some +are no longer transitively included. + +See https://gnu.org/software/gcc/gcc-13/porting_to.html. + +Bug: https://bugs.gentoo.org/895696 +--- a/test/distance/examples/ocr.hpp ++++ b/test/distance/examples/ocr.hpp +@@ -1,4 +1,5 @@ + #pragma once ++#include + #include + + extern std::basic_string ocr_example1; + diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild index 315024591a2e0..adba46f925b6e 100644 --- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild +++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild @@ -24,6 +24,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.11.2-gcc13.patch +) + src_configure() { local mycmakeargs=( -DRAPIDFUZZ_BUILD_TESTING=$(usex test)