mirror of
https://github.com/ankitects/anki.git
synced 2025-09-18 14:02:21 -04:00
Update to Qt 6.5.3 on Windows/Mac
+ Fix incorrect version selection on Mac Closes #2733 (except for Linux users)
This commit is contained in:
Damien Elmes
parent
72e57456ce
commit
b2d515c8bb
6 changed files with 88 additions and 78 deletions
|
|
@ -93,13 +93,13 @@ const MAC_AMD_AUDIO: OnlineArchive = OnlineArchive {
|
|||
};
|
||||
|
||||
const MAC_ARM_QT6: OnlineArchive = OnlineArchive {
|
||||
url: "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2023-09-24/pyqt6.5-mac-arm64.tar.zst",
|
||||
sha256: "3f4ad1861228dd0b9cfbdaf9583155f2e57ef89a06b143929a0ef2d5fc26283e",
|
||||
url: "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2023-10-15/pyqt6.5-mac-arm64.tar.zst",
|
||||
sha256: "1e7f22b146ceeeaf436f9e2137a133d58ff0a4d3c5a0922cde24ca91de59335a",
|
||||
};
|
||||
|
||||
const MAC_AMD_QT6: OnlineArchive = OnlineArchive {
|
||||
url: "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2023-09-24/pyqt6.5-mac-amd64.tar.zst",
|
||||
sha256: "cb77b7836fc87f9c2b167da8274f2cacd0d80031f1d085f3e284016f3ab6ddc3",
|
||||
url: "https://github.com/ankitects/anki-bundle-extras/releases/download/anki-2023-10-15/pyqt6.5-mac-amd64.tar.zst",
|
||||
sha256: "545253985975dba47ac0479adb83247ce53ed7a8f9d51836bef62e224a9dcaf3",
|
||||
};
|
||||
|
||||
const MAC_AMD_QT5: OnlineArchive = OnlineArchive {
|
||||
|
|
@ -184,7 +184,7 @@ fn setup_primary_venv(build: &mut Build) -> Result<()> {
|
|||
"python/requirements.bundle.txt",
|
||||
if cfg!(windows) {
|
||||
"python/requirements.qt6_win.txt"
|
||||
} else if cfg!(target_os = "darwin") {
|
||||
} else if cfg!(target_os = "macos") {
|
||||
"python/requirements.qt6_mac.txt"
|
||||
} else {
|
||||
"python/requirements.qt6_lin.txt"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ pub fn setup_venv(build: &mut Build) -> Result<()> {
|
|||
"python/requirements.qt6_win.txt",
|
||||
"python/requirements.win.txt",
|
||||
]
|
||||
} else if cfg!(target_os = "darwin") {
|
||||
} else if cfg!(target_os = "macos") {
|
||||
inputs!["python/requirements.qt6_mac.txt",]
|
||||
} else if cfg!(all(target_os = "linux", target_arch = "aarch64")) {
|
||||
// system-provided Qt on ARM64
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
pyqt6==6.5.2
|
||||
pyqt6-qt6==6.5.2
|
||||
pyqt6==6.5.3
|
||||
pyqt6-qt6==6.5.3
|
||||
pyqt6-webengine==6.5.0
|
||||
pyqt6-webengine-qt6==6.5.2
|
||||
pyqt6_sip==13.5.2
|
||||
pyqt6-webengine-qt6==6.5.3
|
||||
pyqt6_sip==13.6.0
|
||||
|
|
|
|||
|
|
@ -1,36 +1,41 @@
|
|||
pyqt6==6.5.2 \
|
||||
--hash=sha256:1487ee7350f9ffb66d60ab4176519252c2b371762cbe8f8340fd951f63801280 \
|
||||
--hash=sha256:5bad1437eb0c1ae801103b32ef04ef62ef1cce505b448525f60089ce36329b89 \
|
||||
--hash=sha256:70468cca4537756c714a57fa1baa5beabb9b38775f52f9611f49870705672c55 \
|
||||
--hash=sha256:ff1d12767b578f0f0e87cdb12198e7dcad9a176c40d1d1d799984181b0af93cb
|
||||
pyqt6==6.5.3 \
|
||||
--hash=sha256:9af11aa65afd39b41712a0cf3822f2642e6f9756ebcbcf85b6e438fd9ee4d286 \
|
||||
--hash=sha256:b5db186a6393a53874e9d54b12e63c553c9f09f3a8b77206b64334f17dcaf606 \
|
||||
--hash=sha256:bcbbf9511b038b4924298ca10999aa36eb37a0a38d0638f895f9bba6025c0a77 \
|
||||
--hash=sha256:f95e9d415b8695d3c70c9d09b05198c163ed86c2986f5037ce4ce097d9e4f33d
|
||||
# via
|
||||
# -r requirements.qt6_mac.in
|
||||
# pyqt6-webengine
|
||||
pyqt6-qt6==6.5.2 \
|
||||
--hash=sha256:4b37f6f93c0980469ccc570998d3e3de243028bae7389fb6330443ab215ce2f6 \
|
||||
--hash=sha256:5a3c7bb899678bf801136b31cd589ed4d0d54ab32be5fb76c2bdeb161a9662ad \
|
||||
--hash=sha256:8dad61b4666d91882d7e1c4d619c71e7429c13e19182f8b3bebf3ecf95107d4c \
|
||||
--hash=sha256:953f3c0e99e486081a6d438b32fbc240da97457226562eb68cf1b11c516386fd
|
||||
pyqt6-qt6==6.5.3 \
|
||||
--hash=sha256:04d7d5e4b8789b4c8d19cf7ca4b8439dad2a19d25775b7051cf1dfd9f498ef24 \
|
||||
--hash=sha256:1880abc137f427fbb944d647d542dfa69e83bce8961df5357647e9d1764c51e8 \
|
||||
--hash=sha256:5bbfd6c44b3ab2e702bc761ed31351e96c92c6b85c09924dc6197b48b420a1e5 \
|
||||
--hash=sha256:848311989e35bb8803d1a2a5a44e491ed5b4ef290314ff66d44c26a80cf9d24a
|
||||
# via
|
||||
# -r requirements.qt6_mac.in
|
||||
# pyqt6
|
||||
pyqt6-sip==13.5.2 \
|
||||
--hash=sha256:1bdb1f7b5b2f6ac31d517a6f3a13c38055640ac0014f67a2e5422d2083ce69ec \
|
||||
--hash=sha256:318d4d1c7ef60f69c68227cef78fc439accc9028ec6149200eea3d34c433d373 \
|
||||
--hash=sha256:4b5b0c4b557e0293eba008021342459a0f91c69a7a2eb5231276d495d1d2960a \
|
||||
--hash=sha256:5b499eff7150d9f31fe835a73cc41f076bba2fcde0f5b0325b1284797f17c0ac \
|
||||
--hash=sha256:5d0fd42da765198b51d7fe12c29721cbe3e14b77ca4f68aa43618149ee7dbeff \
|
||||
--hash=sha256:831f5d606fc5296a80303ab30892c3308954c5766039bf7a96267488bb2524a5 \
|
||||
--hash=sha256:87d758ba999baa16459f0a3c7f7ed47a5b45e8991ad691f17345bf3c493a4281 \
|
||||
--hash=sha256:91812f0094443b816a74a89954d60bb50060807f54d7c016a4de7bd29454091e \
|
||||
--hash=sha256:94afb031db89159aa330891eba2c937b0378b4b264570998848c7a78eddf7c94 \
|
||||
--hash=sha256:9ad5b8c4c92d62e00ebf254a4c9656668b130f2a1d2792034e0d82b2d6571509 \
|
||||
--hash=sha256:9c9dac067710015895f523f5a2a4d59cbef8624a152b6f9a426e5b848d8c6d29 \
|
||||
--hash=sha256:ace942b78378bff8ae2d6bafccc84465f1ff0cf30720b8321e0bd6c95c36ede6 \
|
||||
--hash=sha256:b54b0d8d21c5835af8f6d6d8a323a23106e67b7cd4c31e23c35bb4c321000de8 \
|
||||
--hash=sha256:c0b4e55c4d0dc44728da90eb1451dfff0d05260b4a3496ff0014494e6c1865a6 \
|
||||
--hash=sha256:dcf602c233ee7600e810927adcb9e518d61bc796a6b2013c17feedd24c4e5413 \
|
||||
--hash=sha256:ebf6264b6feda01ba37d3b60a4bb87493bdb87be70f7b2a5384a7acd4902d88d
|
||||
pyqt6-sip==13.6.0 \
|
||||
--hash=sha256:0dfd22cfedd87e96f9d51e0778ca2ba3dc0be83e424e9e0f98f6994d8d9c90f0 \
|
||||
--hash=sha256:13885361ca2cb2f5085d50359ba61b3fabd41b139fb58f37332acbe631ef2357 \
|
||||
--hash=sha256:24441032a29791e82beb7dfd76878339058def0e97fdb7c1cea517f3a0e6e96b \
|
||||
--hash=sha256:2486e1588071943d4f6657ba09096dc9fffd2322ad2c30041e78ea3f037b5778 \
|
||||
--hash=sha256:3075d8b325382750829e6cde6971c943352309d35768a4d4da0587459606d562 \
|
||||
--hash=sha256:33ea771fe777eb0d1a2c3ef35bcc3f7a286eb3ff09cd5b2fdd3d87d1f392d7e8 \
|
||||
--hash=sha256:39854dba35f8e5a4288da26ecb5f40b4c5ec1932efffb3f49d5ea435a7f37fb3 \
|
||||
--hash=sha256:3bf03e130fbfd75c9c06e687b86ba375410c7a9e835e4e03285889e61dd4b0c4 \
|
||||
--hash=sha256:43fb8551796030aae3d66d6e35e277494071ec6172cd182c9569ab7db268a2f5 \
|
||||
--hash=sha256:58f68a48400e0b3d1ccb18090090299bad26e3aed7ccb7057c65887b79b8aeea \
|
||||
--hash=sha256:5b9c6b6f9cfccb48cbb78a59603145a698fb4ffd176764d7083e5bf47631d8df \
|
||||
--hash=sha256:747f6ca44af81777a2c696bd501bc4815a53ec6fc94d4e25830e10bc1391f8ab \
|
||||
--hash=sha256:86a7b67c64436e32bffa9c28c9f21bf14a9faa54991520b12c3f6f435f24df7f \
|
||||
--hash=sha256:8c282062125eea5baf830c6998587d98c50be7c3a817a057fb95fef647184012 \
|
||||
--hash=sha256:8f9df9f7ccd8a9f0f1d36948c686f03ce1a1281543a3e636b7b7d5e086e1a436 \
|
||||
--hash=sha256:98bf954103b087162fa63b3a78f30b0b63da22fd6450b610ec1b851dbb798228 \
|
||||
--hash=sha256:9adf672f9114687533a74d5c2d4c03a9a929ad5ad9c3e88098a7da1a440ab916 \
|
||||
--hash=sha256:a6ce80bc24618d8a41be8ca51ad9f10e8bc4296dd90ab2809573df30a23ae0e5 \
|
||||
--hash=sha256:d6b5f699aaed0ac1fcd23e8fbca70d8a77965831b7c1ce474b81b1678817a49d \
|
||||
--hash=sha256:fa759b6339ff7e25f9afe2a6b651b775f0a36bcb3f5fa85e81a90d3b033c83f4 \
|
||||
--hash=sha256:fa7b10af7488efc5e53b41dd42c0f421bde6c2865a107af7ae259aff9d841da9
|
||||
# via
|
||||
# -r requirements.qt6_mac.in
|
||||
# pyqt6
|
||||
|
|
@ -41,11 +46,11 @@ pyqt6-webengine==6.5.0 \
|
|||
--hash=sha256:83a7e97a518d4001fb6c22e26a71e28d6d3b38c40ee0cbe21abfa46982b203d3 \
|
||||
--hash=sha256:8ba9db56c4c181a2a2fab1673ca35e5b63dc69113f085027ddc43c710b6d6ee9
|
||||
# via -r requirements.qt6_mac.in
|
||||
pyqt6-webengine-qt6==6.5.2 \
|
||||
--hash=sha256:03550a3dc85852a1a6ffaa76c172e51965012024624737339f3b7d68e1440b48 \
|
||||
--hash=sha256:1938f6fc4b9b7fdb3e07af1fa1529f23568682ffdd0f074d7b4c0368820aa799 \
|
||||
--hash=sha256:6b32b2e70da7bed2ac2affd51d4c5a5428b45f5fb3eb7cf64000e18cde99a269 \
|
||||
--hash=sha256:7016225fa9ce1f349e828018e9a0e11164cc7d63a4e853d0bd3ee7d99893ee7f
|
||||
pyqt6-webengine-qt6==6.5.3 \
|
||||
--hash=sha256:0eee9b5b9715add644b74c7f82f6984672bc1bb7feb86f447ec056ab1aa99b30 \
|
||||
--hash=sha256:6ef93cc97980f2c25f77d52a758ab5c75cdea648b8aa6aa0310e69850c390398 \
|
||||
--hash=sha256:a64827f39ace4f5507941d156e16a769bd622380c88f316dac4d7a62f5d180a9 \
|
||||
--hash=sha256:b8abe4d9d9b1b7da5552e8a48b5aec8933b3b2693aa5881b8a6d6cbf7b000611
|
||||
# via
|
||||
# -r requirements.qt6_mac.in
|
||||
# pyqt6-webengine
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
pyqt6==6.5.2
|
||||
pyqt6-qt6==6.5.2
|
||||
pyqt6==6.5.3
|
||||
pyqt6-qt6==6.5.3
|
||||
pyqt6-webengine==6.5.0
|
||||
pyqt6-webengine-qt6==6.5.2
|
||||
pyqt6_sip==13.5.2
|
||||
pyqt6-webengine-qt6==6.5.3
|
||||
pyqt6_sip==13.6.0
|
||||
|
|
|
|||
|
|
@ -1,36 +1,41 @@
|
|||
pyqt6==6.5.2 \
|
||||
--hash=sha256:1487ee7350f9ffb66d60ab4176519252c2b371762cbe8f8340fd951f63801280 \
|
||||
--hash=sha256:5bad1437eb0c1ae801103b32ef04ef62ef1cce505b448525f60089ce36329b89 \
|
||||
--hash=sha256:70468cca4537756c714a57fa1baa5beabb9b38775f52f9611f49870705672c55 \
|
||||
--hash=sha256:ff1d12767b578f0f0e87cdb12198e7dcad9a176c40d1d1d799984181b0af93cb
|
||||
pyqt6==6.5.3 \
|
||||
--hash=sha256:9af11aa65afd39b41712a0cf3822f2642e6f9756ebcbcf85b6e438fd9ee4d286 \
|
||||
--hash=sha256:b5db186a6393a53874e9d54b12e63c553c9f09f3a8b77206b64334f17dcaf606 \
|
||||
--hash=sha256:bcbbf9511b038b4924298ca10999aa36eb37a0a38d0638f895f9bba6025c0a77 \
|
||||
--hash=sha256:f95e9d415b8695d3c70c9d09b05198c163ed86c2986f5037ce4ce097d9e4f33d
|
||||
# via
|
||||
# -r requirements.qt6_win.in
|
||||
# pyqt6-webengine
|
||||
pyqt6-qt6==6.5.2 \
|
||||
--hash=sha256:4b37f6f93c0980469ccc570998d3e3de243028bae7389fb6330443ab215ce2f6 \
|
||||
--hash=sha256:5a3c7bb899678bf801136b31cd589ed4d0d54ab32be5fb76c2bdeb161a9662ad \
|
||||
--hash=sha256:8dad61b4666d91882d7e1c4d619c71e7429c13e19182f8b3bebf3ecf95107d4c \
|
||||
--hash=sha256:953f3c0e99e486081a6d438b32fbc240da97457226562eb68cf1b11c516386fd
|
||||
pyqt6-qt6==6.5.3 \
|
||||
--hash=sha256:04d7d5e4b8789b4c8d19cf7ca4b8439dad2a19d25775b7051cf1dfd9f498ef24 \
|
||||
--hash=sha256:1880abc137f427fbb944d647d542dfa69e83bce8961df5357647e9d1764c51e8 \
|
||||
--hash=sha256:5bbfd6c44b3ab2e702bc761ed31351e96c92c6b85c09924dc6197b48b420a1e5 \
|
||||
--hash=sha256:848311989e35bb8803d1a2a5a44e491ed5b4ef290314ff66d44c26a80cf9d24a
|
||||
# via
|
||||
# -r requirements.qt6_win.in
|
||||
# pyqt6
|
||||
pyqt6-sip==13.5.2 \
|
||||
--hash=sha256:1bdb1f7b5b2f6ac31d517a6f3a13c38055640ac0014f67a2e5422d2083ce69ec \
|
||||
--hash=sha256:318d4d1c7ef60f69c68227cef78fc439accc9028ec6149200eea3d34c433d373 \
|
||||
--hash=sha256:4b5b0c4b557e0293eba008021342459a0f91c69a7a2eb5231276d495d1d2960a \
|
||||
--hash=sha256:5b499eff7150d9f31fe835a73cc41f076bba2fcde0f5b0325b1284797f17c0ac \
|
||||
--hash=sha256:5d0fd42da765198b51d7fe12c29721cbe3e14b77ca4f68aa43618149ee7dbeff \
|
||||
--hash=sha256:831f5d606fc5296a80303ab30892c3308954c5766039bf7a96267488bb2524a5 \
|
||||
--hash=sha256:87d758ba999baa16459f0a3c7f7ed47a5b45e8991ad691f17345bf3c493a4281 \
|
||||
--hash=sha256:91812f0094443b816a74a89954d60bb50060807f54d7c016a4de7bd29454091e \
|
||||
--hash=sha256:94afb031db89159aa330891eba2c937b0378b4b264570998848c7a78eddf7c94 \
|
||||
--hash=sha256:9ad5b8c4c92d62e00ebf254a4c9656668b130f2a1d2792034e0d82b2d6571509 \
|
||||
--hash=sha256:9c9dac067710015895f523f5a2a4d59cbef8624a152b6f9a426e5b848d8c6d29 \
|
||||
--hash=sha256:ace942b78378bff8ae2d6bafccc84465f1ff0cf30720b8321e0bd6c95c36ede6 \
|
||||
--hash=sha256:b54b0d8d21c5835af8f6d6d8a323a23106e67b7cd4c31e23c35bb4c321000de8 \
|
||||
--hash=sha256:c0b4e55c4d0dc44728da90eb1451dfff0d05260b4a3496ff0014494e6c1865a6 \
|
||||
--hash=sha256:dcf602c233ee7600e810927adcb9e518d61bc796a6b2013c17feedd24c4e5413 \
|
||||
--hash=sha256:ebf6264b6feda01ba37d3b60a4bb87493bdb87be70f7b2a5384a7acd4902d88d
|
||||
pyqt6-sip==13.6.0 \
|
||||
--hash=sha256:0dfd22cfedd87e96f9d51e0778ca2ba3dc0be83e424e9e0f98f6994d8d9c90f0 \
|
||||
--hash=sha256:13885361ca2cb2f5085d50359ba61b3fabd41b139fb58f37332acbe631ef2357 \
|
||||
--hash=sha256:24441032a29791e82beb7dfd76878339058def0e97fdb7c1cea517f3a0e6e96b \
|
||||
--hash=sha256:2486e1588071943d4f6657ba09096dc9fffd2322ad2c30041e78ea3f037b5778 \
|
||||
--hash=sha256:3075d8b325382750829e6cde6971c943352309d35768a4d4da0587459606d562 \
|
||||
--hash=sha256:33ea771fe777eb0d1a2c3ef35bcc3f7a286eb3ff09cd5b2fdd3d87d1f392d7e8 \
|
||||
--hash=sha256:39854dba35f8e5a4288da26ecb5f40b4c5ec1932efffb3f49d5ea435a7f37fb3 \
|
||||
--hash=sha256:3bf03e130fbfd75c9c06e687b86ba375410c7a9e835e4e03285889e61dd4b0c4 \
|
||||
--hash=sha256:43fb8551796030aae3d66d6e35e277494071ec6172cd182c9569ab7db268a2f5 \
|
||||
--hash=sha256:58f68a48400e0b3d1ccb18090090299bad26e3aed7ccb7057c65887b79b8aeea \
|
||||
--hash=sha256:5b9c6b6f9cfccb48cbb78a59603145a698fb4ffd176764d7083e5bf47631d8df \
|
||||
--hash=sha256:747f6ca44af81777a2c696bd501bc4815a53ec6fc94d4e25830e10bc1391f8ab \
|
||||
--hash=sha256:86a7b67c64436e32bffa9c28c9f21bf14a9faa54991520b12c3f6f435f24df7f \
|
||||
--hash=sha256:8c282062125eea5baf830c6998587d98c50be7c3a817a057fb95fef647184012 \
|
||||
--hash=sha256:8f9df9f7ccd8a9f0f1d36948c686f03ce1a1281543a3e636b7b7d5e086e1a436 \
|
||||
--hash=sha256:98bf954103b087162fa63b3a78f30b0b63da22fd6450b610ec1b851dbb798228 \
|
||||
--hash=sha256:9adf672f9114687533a74d5c2d4c03a9a929ad5ad9c3e88098a7da1a440ab916 \
|
||||
--hash=sha256:a6ce80bc24618d8a41be8ca51ad9f10e8bc4296dd90ab2809573df30a23ae0e5 \
|
||||
--hash=sha256:d6b5f699aaed0ac1fcd23e8fbca70d8a77965831b7c1ce474b81b1678817a49d \
|
||||
--hash=sha256:fa759b6339ff7e25f9afe2a6b651b775f0a36bcb3f5fa85e81a90d3b033c83f4 \
|
||||
--hash=sha256:fa7b10af7488efc5e53b41dd42c0f421bde6c2865a107af7ae259aff9d841da9
|
||||
# via
|
||||
# -r requirements.qt6_win.in
|
||||
# pyqt6
|
||||
|
|
@ -41,11 +46,11 @@ pyqt6-webengine==6.5.0 \
|
|||
--hash=sha256:83a7e97a518d4001fb6c22e26a71e28d6d3b38c40ee0cbe21abfa46982b203d3 \
|
||||
--hash=sha256:8ba9db56c4c181a2a2fab1673ca35e5b63dc69113f085027ddc43c710b6d6ee9
|
||||
# via -r requirements.qt6_win.in
|
||||
pyqt6-webengine-qt6==6.5.2 \
|
||||
--hash=sha256:03550a3dc85852a1a6ffaa76c172e51965012024624737339f3b7d68e1440b48 \
|
||||
--hash=sha256:1938f6fc4b9b7fdb3e07af1fa1529f23568682ffdd0f074d7b4c0368820aa799 \
|
||||
--hash=sha256:6b32b2e70da7bed2ac2affd51d4c5a5428b45f5fb3eb7cf64000e18cde99a269 \
|
||||
--hash=sha256:7016225fa9ce1f349e828018e9a0e11164cc7d63a4e853d0bd3ee7d99893ee7f
|
||||
pyqt6-webengine-qt6==6.5.3 \
|
||||
--hash=sha256:0eee9b5b9715add644b74c7f82f6984672bc1bb7feb86f447ec056ab1aa99b30 \
|
||||
--hash=sha256:6ef93cc97980f2c25f77d52a758ab5c75cdea648b8aa6aa0310e69850c390398 \
|
||||
--hash=sha256:a64827f39ace4f5507941d156e16a769bd622380c88f316dac4d7a62f5d180a9 \
|
||||
--hash=sha256:b8abe4d9d9b1b7da5552e8a48b5aec8933b3b2693aa5881b8a6d6cbf7b000611
|
||||
# via
|
||||
# -r requirements.qt6_win.in
|
||||
# pyqt6-webengine
|
||||
|
|
|
|||
Loading…
Reference in a new issue