[gentoo-commits] repo/gentoo:master commit in: app-misc/anki/files/24.04.1/

[gentoo-commits] repo/gentoo:master commit in: app-misc/anki/files/24.04.1/

[Joonas Niilola]

commit:     2c70c3fc2449f0bdd5b09390ad2b30c6fca97cc2
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Thu Aug  8 02:29:37 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 08:31:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c70c3fc

app-misc/anki: Patch to use newer time

The version of time that anki 24.04.1 uses does not build with Rust
1.80.0[0][1]. This bumps time to 0.3.36 to address the issue.

[0]: https://aur.archlinux.org/packages/anki#comment-984753
[1]: https://github.com/rust-lang/rust/issues/127343

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-misc/anki/files/24.04.1/rust-1.80.0.patch | 31 +++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

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 000000000000..397e43dbb4b2
--- /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 <watermanpaint@posteo.net>
+--- 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",

[gentoo-commits] repo/gentoo:master commit in: app-misc/anki/files/24.04.1/

[Sam James]

commit:     8204231ec2829d15a3cedf9d3f8f5ed37904ca36
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Sun Dec 15 21:54:20 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <watermanpaint <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/39724
Signed-off-by: Sam James <sam <AT> 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 <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 {

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 <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();
- }
-