GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-12-11 05:46:55 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Upgrade to Qt 6.5 on Mac

Browse source 
This bumps the minimum required macOS version to 11 for Qt6.

Closes #2263
This commit is contained in:
Damien Elmes 2023-04-12 16:12:41 +10:00
parent e40acd45a6
commit 7caa807f1d
5 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/configure/src/bundle.rs
View file

@ -91,13 +91,13 @@ const MAC_AMD_AUDIO: OnlineArchive = OnlineArchive {
}; };
const MAC_ARM_QT6: OnlineArchive = OnlineArchive { const MAC_ARM_QT6: OnlineArchive = OnlineArchive {
url: "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2022-09-21/pyqt6.3-mac-arm64.tar.gz", url: "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2023-04-12/pyqt6.5-mac-arm64.tar.zst",
sha256: "5c30f6952b498bb0df31ca23bd3b35e09ea732df528f70df454580b495ecbdfd", sha256: "8a82cc4955c653e052af8e71d72e90ecf6cc2daeaa0b6d7d708e71392580af20",
}; };
const MAC_AMD_QT6: OnlineArchive = OnlineArchive { const MAC_AMD_QT6: OnlineArchive = OnlineArchive {
url: "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2022-09-21/pyqt6.3-mac-amd64.tar.gz", url: "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2023-04-12/pyqt6.5-mac-amd64.tar.zst",
sha256: "252922cfc2c5848d50ef90a903eed43545ef66b189db791bbe621704ef58bcf1", sha256: "f4f998468ea0356af0afb622f2020595e6811197cc444f68f1e6104702584f88",
}; };
const MAC_AMD_QT5: OnlineArchive = OnlineArchive { const MAC_AMD_QT5: OnlineArchive = OnlineArchive {
@ -174,11 +174,7 @@ const QT5_VENV: Venv = Venv {
fn setup_primary_venv(build: &mut Build) -> Result<()> { fn setup_primary_venv(build: &mut Build) -> Result<()> {
let mut qt6_reqs = inputs![ let mut qt6_reqs = inputs![
"python/requirements.bundle.txt", "python/requirements.bundle.txt",
if cfg!(target_os = "macos") { "python/requirements.qt6_5.txt"
"python/requirements.qt6_3.txt"
} else {
"python/requirements.qt6_5.txt"
}
]; ];
if cfg!(windows) { if cfg!(windows) {
qt6_reqs = inputs![qt6_reqs, "python/requirements.win.txt"]; qt6_reqs = inputs![qt6_reqs, "python/requirements.win.txt"];

6
build/configure/src/python.rs
View file

@ -29,11 +29,7 @@ pub fn setup_venv(build: &mut Build) -> Result<()> {
} else { } else {
inputs![ inputs![
"python/requirements.dev.txt", "python/requirements.dev.txt",
if cfg!(target_os = "macos") { "python/requirements.qt6_5.txt"
"python/requirements.qt6_3.txt"
} else {
"python/requirements.qt6_5.txt"
}
] ]
}; };
build.add( build.add(

2
python/update_python_deps.sh
View file

@ -17,7 +17,7 @@ args="--resolver=backtracking --allow-unsafe --no-header --strip-extras --genera
# during bundle # during bundle
../out/pyenv/bin/pip-compile $args $upgrade requirements.bundle.in ../out/pyenv/bin/pip-compile $args $upgrade requirements.bundle.in
../out/pyenv/bin/pip-compile $args $upgrade requirements.qt6_3.in #../out/pyenv/bin/pip-compile $args $upgrade requirements.qt6_3.in
../out/pyenv/bin/pip-compile $args $upgrade requirements.qt6_5.in ../out/pyenv/bin/pip-compile $args $upgrade requirements.qt6_5.in
# ../out/pyenv/bin/pip-compile $args $upgrade requirements.qt5_14.in # ../out/pyenv/bin/pip-compile $args $upgrade requirements.qt5_14.in
# ../out/pyenv/bin/pip-compile $args $upgrade requirements.qt5_15.in # ../out/pyenv/bin/pip-compile $args $upgrade requirements.qt5_15.in

8
qt/bundle/mac/src/main.rs
View file

@ -58,13 +58,7 @@ impl DistKind {
fn macos_min(&self) -> &str { fn macos_min(&self) -> &str {
match self { match self {
DistKind::Standard => { DistKind::Standard => "11",
if cfg!(target_arch = "aarch64") && env::var("MAC_X86").is_err() {
"11"
} else {
"10.14.4"
}
}
DistKind::Alternate => "10.13.4", DistKind::Alternate => "10.13.4",
} }
} }

3
qt/bundle/mac/src/notarize.rs
View file

@ -20,6 +20,9 @@ pub fn notarize_app(output_folder: &Utf8Path) -> Result<()> {
if env::var("ANKI_CODESIGN").is_err() { if env::var("ANKI_CODESIGN").is_err() {
return Ok(()); return Ok(());
} }
if env::var("ANKI_NO_NOTARIZE").is_ok() {
return Ok(());
}
let zip_file = output_folder.with_extension("zip"); let zip_file = output_folder.with_extension("zip");
assert!( assert!(
Command::new("ditto") Command::new("ditto")