Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 75 additions & 0 deletions srcpkgs/anki/patches/cross-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
--- a/build/ninja_gen/src/build.rs
+++ b/build/ninja_gen/src/build.rs
@@ -53,7 +53,7 @@
have_n2: which::which("n2").is_ok(),
};

- build.add_action("build:configure", ConfigureBuild {})?;
+ // build.add_action("build:configure", ConfigureBuild {})?;

Ok(build)
}
--- a/build/ninja_gen/src/render.rs
+++ b/build/ninja_gen/src/render.rs
@@ -2,6 +2,7 @@
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html

use std::fmt::Write;
+use std::env;

use anki_io::create_dir_all;
use anki_io::write_file_if_changed;
@@ -25,7 +26,8 @@
writeln!(&mut buf, "builddir = {}", self.buildroot.as_str()).unwrap();
writeln!(
&mut buf,
- "runner = $builddir/rust/release/{}",
+ "runner = $builddir/rust/{}/release/{}",
+ env::var("RUST_BUILD").unwrap(),
with_exe("runner")
)
.unwrap();
--- a/build/ninja_gen/src/cargo.rs
+++ b/build/ninja_gen/src/cargo.rs
@@ -97,7 +97,7 @@
.release_override
.unwrap_or_else(|| build.build_profile());
let release_arg = profile_arg_for_cargo(release_build).unwrap_or_default();
- let target_arg = if let Some(target) = self.target {
+ let target_arg = if let Some(target) = &self.target {
format!("--target {target}")
} else {
"".into()
@@ -115,7 +115,7 @@
let output_root = Utf8Path::new("$builddir/rust");
for output in self.outputs {
let name = output.name();
- let path = output.path(output_root, self.target, release_build);
+ let path = output.path(output_root, self.target.as_deref(), release_build);
build.add_outputs_ext(name, vec![path], true);
}
}
--- a/build/configure/src/platform.rs
+++ b/build/configure/src/platform.rs
@@ -6,8 +6,8 @@
use ninja_gen::archives::Platform;

/// Please see [`overriden_python_target_platform()`] for details.
-pub fn overriden_rust_target_triple() -> Option<&'static str> {
- overriden_python_wheel_platform().map(|p| p.as_rust_triple())
+pub fn overriden_rust_target_triple() -> Option<String> {
+ env::var("RUST_TARGET").ok()
}

/// Usually None to use the host architecture, but:
--- a/build/ninja_gen/src/cargo.rs
+++ b/build/ninja_gen/src/cargo.rs
@@ -79,7 +79,7 @@
pub struct CargoBuild<'a> {
pub inputs: BuildInput,
pub outputs: &'a [RustOutput<'a>],
- pub target: Option<&'static str>,
+ pub target: Option<String>,
pub extra_args: &'a str,
pub release_override: Option<BuildProfile>,
}
10 changes: 0 additions & 10 deletions srcpkgs/anki/patches/disable_popup.patch

This file was deleted.

8 changes: 0 additions & 8 deletions srcpkgs/anki/patches/fix_distutils_not_found.patch

This file was deleted.

42 changes: 0 additions & 42 deletions srcpkgs/anki/patches/fix_float.patch

This file was deleted.

29 changes: 0 additions & 29 deletions srcpkgs/anki/patches/fix_mpv_args.patch

This file was deleted.

15 changes: 0 additions & 15 deletions srcpkgs/anki/patches/fix_profile_save.patch

This file was deleted.

11 changes: 0 additions & 11 deletions srcpkgs/anki/patches/fix_unescape.patch

This file was deleted.

24 changes: 24 additions & 0 deletions srcpkgs/anki/patches/no-corepack.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
+https://gitlab.archlinux.org/archlinux/packaging/packages/anki
--- i/build/ninja_gen/src/node.rs
+++ w/build/ninja_gen/src/node.rs
@@ -52,7 +52,7 @@ impl BuildAction for YarnSetup {
if cfg!(windows) {
"corepack.cmd enable yarn"
} else {
- "corepack enable yarn"
+ "true"
}
}

diff --git i/package.json w/package.json
index f85945cd5..40ec95796 100644
--- i/package.json
+++ w/package.json
@@ -92,6 +92,5 @@
"Chrome 77",
"iOS 14.5"
],
- "type": "module",
- "packageManager": "yarn@4.11.0"
+ "type": "module"
}
12 changes: 12 additions & 0 deletions srcpkgs/anki/patches/no-update.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
+https://gitlab.archlinux.org/archlinux/packaging/packages/anki
--- a/qt/aqt/update.py
+++ b/qt/aqt/update.py
@@ -11,6 +11,8 @@ from aqt.utils import openLink, show_warning, showText, tr


def check_for_update() -> None:
+ return
+
from aqt import mw

def do_check(_col: Collection) -> CheckForUpdateResponse:
20 changes: 20 additions & 0 deletions srcpkgs/anki/patches/reproducible-sveltekit.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
+https://gitlab.archlinux.org/archlinux/packaging/packages/anki
--- i/ts/svelte.config.js
+++ w/ts/svelte.config.js
@@ -1,5 +1,6 @@
import adapter from "@sveltejs/adapter-static";
import { vitePreprocess } from "@sveltejs/vite-plugin-svelte";
+import { readFileSync } from "fs";
import { dirname, join } from "path";
import preprocess from "svelte-preprocess";
import { fileURLToPath } from "url";
@@ -17,6 +18,9 @@ const config = {
adapter: adapter(
{ pages: "../out/sveltekit", fallback: "index.html", precompress: false },
),
+ version: {
+ name: readFileSync(join(tsFolder, "../.version"), "utf-8").trim(),
+ },
alias: {
"@tslib": join(tsFolder, "lib/tslib"),
"@generated": join(tsFolder, "../out/ts/lib/generated"),
8 changes: 8 additions & 0 deletions srcpkgs/anki/patches/strip-formatter-deps.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
+https://gitlab.archlinux.org/archlinux/packaging/packages/anki
--- i/pylib/tools/hookslib.py
+++ w/pylib/tools/hookslib.py
@@ -205,4 +205,3 @@ def write_file(path: str, hooks: list[Hook], prefix: str, suffix: str):

with open(path, "wb") as file:
file.write(code.encode("utf8"))
- subprocess.run([sys.executable, "-m", "ruff", "format", "-q", path], check=True)
21 changes: 21 additions & 0 deletions srcpkgs/anki/patches/strip-type-checking-deps.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
+https://gitlab.archlinux.org/archlinux/packaging/packages/anki
--- i/build/configure/src/python.rs
+++ w/build/configure/src/python.rs
@@ -81,9 +81,7 @@ pub struct GenPythonProto {
impl BuildAction for GenPythonProto {
fn command(&self) -> &str {
"$protoc $
- --plugin=protoc-gen-mypy=$protoc-gen-mypy $
--python_out=$builddir/pylib $
- --mypy_out=$builddir/pylib $
-Iproto $in"
}

@@ -101,7 +99,6 @@ impl BuildAction for GenPythonProto {
.collect();
build.add_inputs("in", &self.proto_files);
build.add_inputs("protoc", inputs![":protoc_binary"]);
- build.add_inputs("protoc-gen-mypy", inputs![":pyenv:protoc-gen-mypy"]);
build.add_outputs("", python_outputs);
}

Loading