commit: 082510a288a21536c324bdc538a81d97371727ca Author: Steffen Winter <steffen.winter <AT> proton <DOT> me> AuthorDate: Tue Mar 26 13:39:58 2024 +0000 Commit: Rui Huang <vowstar <AT> gmail <DOT> com> CommitDate: Tue Mar 26 13:40:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=082510a2
dev-cpp/scnlib: fix compilation with simdutf-5.0.0 Fixes: https://bugs.gentoo.org/927799 Signed-off-by: Steffen Winter <steffen.winter <AT> proton.me> .../scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch | 16 ++++++++++++++++ ...ps.patch => scnlib-2.0.2-no-external-test-deps.patch} | 0 dev-cpp/scnlib/scnlib-2.0.2.ebuild | 6 +++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dev-cpp/scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch b/dev-cpp/scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch new file mode 100644 index 0000000000..3e42ae495a --- /dev/null +++ b/dev-cpp/scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake +index ae2832b..186fbed 100644 +--- a/cmake/dependencies.cmake ++++ b/cmake/dependencies.cmake +@@ -61,7 +61,10 @@ endif () + # we don't want to include tests of dependencies, so we need to do some manual work + + if (SCN_USE_EXTERNAL_SIMDUTF) +- find_package(simdutf 4.0.0 CONFIG REQUIRED) ++ find_package(simdutf 5.0.0 CONFIG) ++ if(NOT simdutf_FOUND) ++ find_package(simdutf 4.0.0 CONFIG REQUIRED) ++ endif() + else () + FetchContent_Declare( + simdutf diff --git a/dev-cpp/scnlib/files/scnlib-2.0.0-no-external-test-deps.patch b/dev-cpp/scnlib/files/scnlib-2.0.2-no-external-test-deps.patch similarity index 100% rename from dev-cpp/scnlib/files/scnlib-2.0.0-no-external-test-deps.patch rename to dev-cpp/scnlib/files/scnlib-2.0.2-no-external-test-deps.patch diff --git a/dev-cpp/scnlib/scnlib-2.0.2.ebuild b/dev-cpp/scnlib/scnlib-2.0.2.ebuild index 9d0703af8f..dd3f493e65 100644 --- a/dev-cpp/scnlib/scnlib-2.0.2.ebuild +++ b/dev-cpp/scnlib/scnlib-2.0.2.ebuild @@ -22,8 +22,12 @@ BDEPEND=" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}/${P}-accept-newer-simdutf.patch" +) + src_prepare() { - use test && eapply "${FILESDIR}/${PN}-2.0.0-no-external-test-deps.patch" + use test && eapply "${FILESDIR}/${P}-no-external-test-deps.patch" cmake_src_prepare }
