From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 210051580FD for ; Fri, 27 Dec 2024 12:08:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C34AE07D7; Fri, 27 Dec 2024 12:08:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44FA8E07D7 for ; Fri, 27 Dec 2024 12:08:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F01C33BE32 for ; Fri, 27 Dec 2024 12:08:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AAE9F190B for ; Fri, 27 Dec 2024 12:08:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1735301260.8204231ec2829d15a3cedf9d3f8f5ed37904ca36.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/anki/files/24.04.1/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/anki/files/24.04.1/ninja-gentoo-setup.patch app-misc/anki/files/24.04.1/remove-yarn.patch X-VCS-Directories: app-misc/anki/files/24.04.1/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8204231ec2829d15a3cedf9d3f8f5ed37904ca36 X-VCS-Branch: master Date: Fri, 27 Dec 2024 12:08:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6a5b538d-c45e-4cbd-8287-7f1459a8368b X-Archives-Hash: 5a33788b08dd6c13ba25ea01ad70c269 commit: 8204231ec2829d15a3cedf9d3f8f5ed37904ca36 Author: Lucio Sauer posteo net> AuthorDate: Sun Dec 15 21:54:20 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Dec 27 12:07:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8204231e app-misc/anki: remove unused patches These should have been removed with commit "app-misc/anki: drop 24.04.1" (ecbac01bd0f72890ca1c23b46d3990be814495f7). Signed-off-by: Lucio Sauer posteo.net> Closes: https://github.com/gentoo/gentoo/pull/39724 Signed-off-by: Sam James gentoo.org> .../anki/files/24.04.1/ninja-gentoo-setup.patch | 45 -------------- app-misc/anki/files/24.04.1/remove-yarn.patch | 71 ---------------------- 2 files changed, 116 deletions(-) diff --git a/app-misc/anki/files/24.04.1/ninja-gentoo-setup.patch b/app-misc/anki/files/24.04.1/ninja-gentoo-setup.patch deleted file mode 100644 index 9774d4e407ee..000000000000 --- a/app-misc/anki/files/24.04.1/ninja-gentoo-setup.patch +++ /dev/null @@ -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 ---- 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 { diff --git a/app-misc/anki/files/24.04.1/remove-yarn.patch b/app-misc/anki/files/24.04.1/remove-yarn.patch deleted file mode 100644 index 9343f426de58..000000000000 --- a/app-misc/anki/files/24.04.1/remove-yarn.patch +++ /dev/null @@ -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 ---- 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(); - } -