From a45888ffd84ea1a84427246938325e237cfaf756 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Fri, 6 Jun 2025 19:33:41 +0200 Subject: [PATCH] app-misc/anki: clean up patches * We no longer invoke the build system for running cargo-nextest since 5cd794. Now, I'm removing the corresponding patch in ninja-rules-for-cargo.patch, which formerly prevented network access in that scenario. Fixes: 5cd7947a1b92e982e6bc96aa3019d8ccf532bd3d Signed-off-by: Lucio Sauer Part-of: https://github.com/gentoo/gentoo/pull/42917 Signed-off-by: Sam James --- .../files/23.12.1/ninja-rules-for-cargo.patch | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch b/app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch index cf9356bbc24c4..8f0e65e09b86c 100644 --- a/app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch +++ b/app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch @@ -2,9 +2,6 @@ Fix the output path for Rust binaries in the Ninja file to match Cargo's target directory when CARGO_BUILD_TARGET is set. This prevents file-not-found errors for some build steps. -Provide the cargo-nextest binary ourselves to prevent network access. -Set test runner options in the ebuild. - From: Lucio Sauer --- a/build/ninja_gen/src/cargo.rs +++ b/build/ninja_gen/src/cargo.rs @@ -18,23 +15,3 @@ From: Lucio Sauer } path = path.join(profile_output_dir(build_profile)).join(filename); path.to_string() -@@ -152,19 +155,11 @@ impl BuildAction for CargoTest { - - fn files(&mut self, build: &mut impl FilesHandle) { - build.add_inputs("", &self.inputs); -- build.add_inputs("", inputs![":cargo-nextest"]); - build.add_env_var("ANKI_TEST_MODE", "1"); - build.add_output_stamp("tests/cargo_test"); - } - - fn on_first_instance(&self, build: &mut Build) -> Result<()> { -- build.add_action( -- "cargo-nextest", -- CargoInstall { -- binary_name: "cargo-nextest", -- args: "cargo-nextest --version 0.9.57 --locked", -- }, -- )?; - setup_flags(build) - } - }