gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

app-misc/anki: remove unused patches

Browse Source 
These should have been removed with commit "app-misc/anki: drop 24.04.1"
(ecbac01bd0).

Signed-off-by: Lucio Sauer <watermanpaint@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/39724
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Lucio Sauer
2024-12-15 22:54:20 +01:00
committed by Sam James
parent 479f7b40d4
commit 8204231ec2
2 changed files with 0 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app-misc/anki/files/24.04.1/ninja-gentoo-setup.patch
View File

@@ -1,45 +0,0 @@
Respect app-alternatives/ninja (n2 is not yet in the tree) and
user variables from the ninja-utils eclass.
This is a workaround. A proper implementation similar to
the LTO implementation (c6f429) should allow the build system to be set at
configure time.
From: Lucio Sauer <watermanpaint@posteo.net>
--- a/build/ninja_gen/src/build.rs
+++ b/build/ninja_gen/src/build.rs
@@ -49,7 +49,7 @@ impl Build {
output_text: Default::default(),
action_names: Default::default(),
groups: Default::default(),
- have_n2: which::which("n2").is_ok(),
+ have_n2: false,
};
build.add_action("build:configure", ConfigureBuild {})?;
--- a/build/runner/src/build.rs
+++ b/build/runner/src/build.rs
@@ -56,6 +56,11 @@ pub fn run_build(args: BuildArgs) {
let start_time = Instant::now();
let mut command = Command::new(get_ninja_command());
+
+ if env::var("NINJA_VERBOSE").unwrap_or(String::from("ON")).eq("ON") {
+ command.arg("-v");
+ }
+
command
.arg("-f")
.arg(&build_file)
@@ -112,11 +117,7 @@ pub fn run_build(args: BuildArgs) {
}
fn get_ninja_command() -> &'static str {
- if which::which("n2").is_ok() {
- "n2"
- } else {
- "ninja"
- }
+ "ninja"
}
fn setup_build_root() -> Utf8PathBuf {

71
app-misc/anki/files/24.04.1/remove-yarn.patch
View File

@@ -1,71 +0,0 @@
The ebuild ships a ready-to-use node_modules tarball which does not require
sys-apps/yarn to be installed. Pre-built node_modules allows us to run JS tests
but we lose the ability to hack node packages' source files in YARN_CACHE_FOLDER.
From: Lucio Sauer <watermanpaint@posteo.net>
--- a/build/ninja_gen/src/node.rs
+++ b/build/ninja_gen/src/node.rs
@@ -76,12 +76,11 @@ pub struct YarnInstall<'a> {
impl BuildAction for YarnInstall<'_> {
fn command(&self) -> &str {
- "$runner yarn $yarn $out"
+ "$runner yarn $out"
}
fn files(&mut self, build: &mut impl build::FilesHandle) {
build.add_inputs("", &self.package_json_and_lock);
- build.add_inputs("yarn", inputs![":yarn:bin"]);
build.add_outputs("out", vec!["node_modules/.marker"]);
for (key, value) in &self.exports {
let outputs: Vec<_> = value.iter().map(|o| format!("node_modules/{o}")).collect();
@@ -139,9 +138,7 @@ pub fn setup_node(
);
build.add_dependency("yarn:bin", inputs![path]);
}
- Err(_) => {
- build.add_action("yarn", YarnSetup {})?;
- }
+ Err(_) => ()
};
for binary in binary_exports {
--- a/build/runner/src/yarn.rs
+++ b/build/runner/src/yarn.rs
@@ -1,36 +1,18 @@
// Copyright: Ankitects Pty Ltd and contributors
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-use std::env;
use std::path::Path;
-use std::process::Command;
use clap::Args;
-use crate::run::run_command;
-
#[derive(Args)]
pub struct YarnArgs {
- yarn_bin: String,
stamp: String,
}
pub fn setup_yarn(args: YarnArgs) {
link_node_modules();
- if env::var("OFFLINE_BUILD").is_ok() {
- println!("OFFLINE_BUILD is set");
- println!("Running yarn with '--offline' and '--ignore-scripts'.");
- run_command(
- Command::new(&args.yarn_bin)
- .arg("install")
- .arg("--offline")
- .arg("--ignore-scripts"),
- );
- } else {
- run_command(Command::new(&args.yarn_bin).arg("install"));
- }
-
std::fs::write(args.stamp, b"").unwrap();
}