From 383c890b0db09eea180014e429dac516d95b7a28 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Thu, 26 May 2022 11:04:17 +1000 Subject: [PATCH] Fix duplicate Anki icons appearing in dock MPV was previously stored in the MacOS/ folder, which made macOS think it should have a dock icon. Fixes #1812 --- qt/aqt/sound.py | 2 ++ repos.bzl | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/qt/aqt/sound.py b/qt/aqt/sound.py index a6bbb17f7..5839d2dae 100644 --- a/qt/aqt/sound.py +++ b/qt/aqt/sound.py @@ -247,6 +247,8 @@ def _packagedCmd(cmd: list[str]) -> tuple[Any, dict[str, str]]: if is_win: packaged_path = Path(sys.prefix) / "audio" / (cmd[0] + ".exe") + elif is_mac: + packaged_path = Path(sys.prefix) / ".." / "Resources" / cmd[0] else: packaged_path = Path(sys.prefix) / cmd[0] if packaged_path.exists(): diff --git a/repos.bzl b/repos.bzl index c673d926f..ac17f9d43 100644 --- a/repos.bzl +++ b/repos.bzl @@ -209,9 +209,9 @@ exports_files(["l10n.toml"]) name = "audio_mac_amd64", build_file_content = " ", urls = [ - "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2022-02-09/audio-mac-amd64.tar.gz", + "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2022-05-26/audio-mac-amd64.tar.gz", ], - sha256 = "d9310cbd6bed09d6d36deb8b7611bffbd161628512b1bf8d7becfdf78b5cd1dd", + sha256 = "ecbb3c878805cdd58b1a0b8e3fd8c753b8ce3ad36c8b5904a79111f9db29ff42", ) maybe( @@ -219,9 +219,9 @@ exports_files(["l10n.toml"]) name = "audio_mac_arm64", build_file_content = " ", urls = [ - "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2022-02-09/audio-mac-arm64.tar.gz", + "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2022-05-26/audio-mac-arm64.tar.gz", ], - sha256 = "c30a772132a16fa79d9a1e60f5dce2f91fe8077e2709a8f39ef499d49f6a4b0e", + sha256 = "f6c4af9be59ae1c82a16f5c6307f13cbf31b49ad7b69ce1cb6e0e7b403cfdb8f", ) maybe(