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

Update macOS bundle to Qt 6.4.0

Browse Source 
This bumps the minimum OS version to 10.14
This commit is contained in:
Damien Elmes 2022-10-10 12:56:47 +10:00
parent 276c42e250
commit f855fc67ad
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/mac/src/Info.plist
View File

@ -7,7 +7,7 @@
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>2.1.46</string> <string>2.1.46</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>10.13.4</string> <string>10.14.0</string>
<key>CFBundleDocumentTypes</key> <key>CFBundleDocumentTypes</key>
<array> <array>
<dict> <dict>

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

@ -58,8 +58,8 @@ impl Variant {
fn qt_repo(&self) -> &str { fn qt_repo(&self) -> &str {
match self { match self {
Variant::StandardX86 => "pyqt6.3_mac_bundle_amd64", Variant::StandardX86 => "pyqt6.4_mac_bundle_amd64",
Variant::StandardArm => "pyqt6.3_mac_bundle_arm64", Variant::StandardArm => "pyqt6.4_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.3_mac_bundle_amd64", name = "pyqt6.4_mac_bundle_amd64",
build_file_content = " ", build_file_content = " ",
urls = [ urls = [
"https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2022-09-21/pyqt6.3-mac-amd64.tar.gz", "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2022-10-10/pyqt6.4-mac-amd64.tar.gz",
], ],
sha256 = "252922cfc2c5848d50ef90a903eed43545ef66b189db791bbe621704ef58bcf1", sha256 = "6da02be0ffbbbdb5db80c1c65d01bdbf0207c04378019fcf6109796adc97916e",
) )
maybe( maybe(
http_archive, http_archive,
name = "pyqt6.3_mac_bundle_arm64", name = "pyqt6.4_mac_bundle_arm64",
build_file_content = " ", build_file_content = " ",
urls = [ urls = [
"https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2022-09-21/pyqt6.3-mac-arm64.tar.gz", "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2022-10-10/pyqt6.4-mac-arm64.tar.gz",
], ],
sha256 = "5c30f6952b498bb0df31ca23bd3b35e09ea732df528f70df454580b495ecbdfd", sha256 = "96f5b3e64f3eeebbb8c60f85d547bbe21a3e8dfbc1135286fcd37482c8c4d87b",
) )
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.3_mac_bundle_amd64//:* > /dev/null bazel query @pyqt6.4_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.3_mac_bundle_arm64//:* > /dev/null bazel query @pyqt6.4_mac_bundle_arm64//:* > /dev/null
bazel query @protobuf_wheel_mac_arm64//:* > /dev/null bazel query @protobuf_wheel_mac_arm64//:* > /dev/null
fi fi