From 7caa807f1dcf65149311b341d82ba9efe317cee1 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Wed, 12 Apr 2023 16:12:41 +1000
Subject: [PATCH] Upgrade to Qt 6.5 on Mac

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

Closes #2263
---
 build/configure/src/bundle.rs | 14 +++++---------
 build/configure/src/python.rs |  6 +-----
 python/update_python_deps.sh  |  2 +-
 qt/bundle/mac/src/main.rs     |  8 +-------
 qt/bundle/mac/src/notarize.rs |  3 +++
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/build/configure/src/bundle.rs b/build/configure/src/bundle.rs
index 75ef1dc3f..8ba5f5c57 100644
--- a/build/configure/src/bundle.rs
+++ b/build/configure/src/bundle.rs
@@ -91,13 +91,13 @@ const MAC_AMD_AUDIO: 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",
-    sha256: "5c30f6952b498bb0df31ca23bd3b35e09ea732df528f70df454580b495ecbdfd",
+    url: "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2023-04-12/pyqt6.5-mac-arm64.tar.zst",
+    sha256: "8a82cc4955c653e052af8e71d72e90ecf6cc2daeaa0b6d7d708e71392580af20",
 };
 
 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",
-    sha256: "252922cfc2c5848d50ef90a903eed43545ef66b189db791bbe621704ef58bcf1",
+    url: "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2023-04-12/pyqt6.5-mac-amd64.tar.zst",
+    sha256: "f4f998468ea0356af0afb622f2020595e6811197cc444f68f1e6104702584f88",
 };
 
 const MAC_AMD_QT5: OnlineArchive = OnlineArchive {
@@ -174,11 +174,7 @@ const QT5_VENV: Venv = Venv {
 fn setup_primary_venv(build: &mut Build) -> Result<()> {
     let mut qt6_reqs = inputs![
         "python/requirements.bundle.txt",
-        if cfg!(target_os = "macos") {
-            "python/requirements.qt6_3.txt"
-        } else {
-            "python/requirements.qt6_5.txt"
-        }
+        "python/requirements.qt6_5.txt"
     ];
     if cfg!(windows) {
         qt6_reqs = inputs![qt6_reqs, "python/requirements.win.txt"];
diff --git a/build/configure/src/python.rs b/build/configure/src/python.rs
index 2990c4436..32b8c4d9a 100644
--- a/build/configure/src/python.rs
+++ b/build/configure/src/python.rs
@@ -29,11 +29,7 @@ pub fn setup_venv(build: &mut Build) -> Result<()> {
     } else {
         inputs![
             "python/requirements.dev.txt",
-            if cfg!(target_os = "macos") {
-                "python/requirements.qt6_3.txt"
-            } else {
-                "python/requirements.qt6_5.txt"
-            }
+            "python/requirements.qt6_5.txt"
         ]
     };
     build.add(
diff --git a/python/update_python_deps.sh b/python/update_python_deps.sh
index 71c96328d..0fae8fe18 100755
--- a/python/update_python_deps.sh
+++ b/python/update_python_deps.sh
@@ -17,7 +17,7 @@ args="--resolver=backtracking --allow-unsafe --no-header --strip-extras --genera
 
 # during bundle
 ../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.qt5_14.in
 # ../out/pyenv/bin/pip-compile $args $upgrade requirements.qt5_15.in
diff --git a/qt/bundle/mac/src/main.rs b/qt/bundle/mac/src/main.rs
index b98a877a8..81c9559e6 100644
--- a/qt/bundle/mac/src/main.rs
+++ b/qt/bundle/mac/src/main.rs
@@ -58,13 +58,7 @@ impl DistKind {
 
     fn macos_min(&self) -> &str {
         match self {
-            DistKind::Standard => {
-                if cfg!(target_arch = "aarch64") && env::var("MAC_X86").is_err() {
-                    "11"
-                } else {
-                    "10.14.4"
-                }
-            }
+            DistKind::Standard => "11",
             DistKind::Alternate => "10.13.4",
         }
     }
diff --git a/qt/bundle/mac/src/notarize.rs b/qt/bundle/mac/src/notarize.rs
index 6a241c349..0688354f9 100644
--- a/qt/bundle/mac/src/notarize.rs
+++ b/qt/bundle/mac/src/notarize.rs
@@ -20,6 +20,9 @@ pub fn notarize_app(output_folder: &Utf8Path) -> Result<()> {
     if env::var("ANKI_CODESIGN").is_err() {
         return Ok(());
     }
+    if env::var("ANKI_NO_NOTARIZE").is_ok() {
+        return Ok(());
+    }
     let zip_file = output_folder.with_extension("zip");
     assert!(
         Command::new("ditto")