diff --git a/app-misc/anki/files/23.12.1/use-system-nextest.patch b/app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch similarity index 50% rename from app-misc/anki/files/23.12.1/use-system-nextest.patch rename to app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch index 8f931b97da86a..cf9356bbc24c4 100644 --- a/app-misc/anki/files/23.12.1/use-system-nextest.patch +++ b/app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch @@ -1,10 +1,24 @@ -Provide the binary ourselves to prevent network access. +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 -@@ -152,19 +152,11 @@ impl BuildAction for CargoTest { +@@ -61,6 +61,9 @@ impl RustOutput<'_> { + let mut path: Utf8PathBuf = rust_base.into(); + if let Some(target) = target { + path = path.join(target); ++ } else { ++ let triple = std::env::var("CARGO_BUILD_TARGET").unwrap_or_default(); ++ path = path.join(triple); + } + 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); diff --git a/app-misc/anki/files/24.04.1/rust-1.80.0.patch b/app-misc/anki/files/24.04.1/rust-1.80.0.patch new file mode 100644 index 0000000000000..397e43dbb4b2f --- /dev/null +++ b/app-misc/anki/files/24.04.1/rust-1.80.0.patch @@ -0,0 +1,31 @@ +Allow builds with ~virtual/rust-1.80.0 + +https://github.com/gentoo/gentoo/pull/37727#issuecomment-2251642236 +https://github.com/time-rs/time/issues/693 +Author: Lucio Sauer +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -5515,9 +5515,9 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.34" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", +@@ -5536,9 +5536,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.17" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ + "num-conv", + "time-core",