langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Mac build to Qt 6.3

Browse Source
This commit is contained in:
Damien Elmes 2022-04-20 21:25:57 +10:00
parent 30d55aa553
commit 031fc625fd
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qt/bundle/build.py
View File

@ -389,7 +389,7 @@ if is_win:
build_windows_installers() build_windows_installers()
if is_mac: if is_mac:
print("outputs are in .bazel/out/build/{std,alt}") print("outputs are in .bazel/out/build/app")
print("dmg can be created with mac/finalize.py dmg") print("dmg can be created with mac/finalize.py dmg")
else: else:
print("outputs are in .bazel/out/dist/") print("outputs are in .bazel/out/dist/")

4
qt/bundle/mac/src/main.rs
View File

@ -56,8 +56,8 @@ impl Variant {
fn qt_repo(&self) -> &str { fn qt_repo(&self) -> &str {
match self { match self {
Variant::StandardX86 => "pyqt6.2_mac_bundle_amd64", Variant::StandardX86 => "pyqt6.3_mac_bundle_amd64",
Variant::StandardArm => "pyqt6.2_mac_bundle_arm64", Variant::StandardArm => "pyqt6.3_mac_bundle_arm64",
Variant::AlternateX86 => "pyqt5.14_mac_bundle_amd64", Variant::AlternateX86 => "pyqt5.14_mac_bundle_amd64",
} }
} }

12
repos.bzl
View File

@ -226,22 +226,22 @@ exports_files(["l10n.toml"])
maybe( maybe(
http_archive, http_archive,
name = "pyqt6.2_mac_bundle_amd64", name = "pyqt6.3_mac_bundle_amd64",
build_file_content = " ", build_file_content = " ",
urls = [ urls = [
"https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2022-02-09/pyqt6.2-mac-amd64.tar.gz", "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2022-04-20/pyqt6.3-mac-amd64.tar.gz",
], ],
sha256 = "c7bf899eee33fcb3b5848f5d3e5fc390012efc05c2308e4349b7bbd5939c85f0", sha256 = "949d403c26036cd13a4a0c86c9416f32ac6d2aa58c6946be93ab949ee6cf9b11",
) )
maybe( maybe(
http_archive, http_archive,
name = "pyqt6.2_mac_bundle_arm64", name = "pyqt6.3_mac_bundle_arm64",
build_file_content = " ", build_file_content = " ",
urls = [ urls = [
"https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2022-02-09/pyqt6.2-mac-arm64.tar.gz", "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2022-04-20/pyqt6.3-mac-arm64.tar.gz",
], ],
sha256 = "7a4b7d5bd65c83fd16cf7e56929183ef0d1d7bb67f9deea8f2482d7378e0ea02", sha256 = "c7df555623cdbd8f6981c15b4bfc58665b8e92d91fb43a7082bcfa1852ede10d",
) )
maybe( maybe(

4
tools/bundle
View File

@ -22,11 +22,11 @@ bazel query @pyoxidizer//:*
if [[ "$OSTYPE" == "darwin"* ]]; then if [[ "$OSTYPE" == "darwin"* ]]; then
if [ $(uname -m) != "arm64" ]; then if [ $(uname -m) != "arm64" ]; then
bazel query @audio_mac_amd64//:* > /dev/null bazel query @audio_mac_amd64//:* > /dev/null
bazel query @pyqt6.2_mac_bundle_amd64//:* > /dev/null bazel query @pyqt6.3_mac_bundle_amd64//:* > /dev/null
bazel query @pyqt5.14_mac_bundle_amd64//:* > /dev/null bazel query @pyqt5.14_mac_bundle_amd64//:* > /dev/null
else else
bazel query @audio_mac_arm64//:* > /dev/null bazel query @audio_mac_arm64//:* > /dev/null
bazel query @pyqt6.2_mac_bundle_arm64//:* > /dev/null bazel query @pyqt6.3_mac_bundle_arm64//:* > /dev/null
bazel query @protobuf_wheel_mac_arm64//:* > /dev/null bazel query @protobuf_wheel_mac_arm64//:* > /dev/null
fi fi