From 20dc2815583f900651dbdd8b45369220ad24c7b8 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Thu, 28 Dec 2023 18:17:50 +1000 Subject: [PATCH] Revert "Update to Qt 6.6.1 on Mac" This reverts commit cbab96ec75ff4a600c5b9f5f023d0496dfee061a. This moves the bundle back to Qt 5.3 due to https://forums.ankiweb.net/t/anki-23-12-mac-apple-qt6-dmg-crashing-on-browser/38783 We'll move back up when 6.6.2 comes out in mid-late Jan. --- build/configure/src/bundle.rs | 8 ++++---- python/requirements.qt6_mac.in | 6 +++--- python/requirements.qt6_mac.txt | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/configure/src/bundle.rs b/build/configure/src/bundle.rs index acc1b5485..4b2552160 100644 --- a/build/configure/src/bundle.rs +++ b/build/configure/src/bundle.rs @@ -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-12-04/pyqt6.6-mac-arm64.tar.zst", - sha256: "cc48412ce5a87fc7cdae1a44285641ca85ee4fb06badf9c2f62af228968d3ffe", + 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-12-04/pyqt6.6-mac-amd64.tar.zst", - sha256: "77327beee2fad6c49ed0879d5335628dc690bf32f7550a25db1e1eee130a5d93", + 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 { diff --git a/python/requirements.qt6_mac.in b/python/requirements.qt6_mac.in index 00c9f2640..dae6b4935 100644 --- a/python/requirements.qt6_mac.in +++ b/python/requirements.qt6_mac.in @@ -1,5 +1,5 @@ -pyqt6==6.6.1 -pyqt6-qt6==6.6.1 +pyqt6==6.6.0 +pyqt6-qt6==6.6.0 pyqt6-webengine==6.6.0 -pyqt6-webengine-qt6==6.6.1 +pyqt6-webengine-qt6==6.6.0 pyqt6_sip==13.6.0 diff --git a/python/requirements.qt6_mac.txt b/python/requirements.qt6_mac.txt index d22b7c639..7836e0871 100644 --- a/python/requirements.qt6_mac.txt +++ b/python/requirements.qt6_mac.txt @@ -6,11 +6,11 @@ pyqt6==6.6.1 \ # via # -r requirements.qt6_mac.in # pyqt6-webengine -pyqt6-qt6==6.6.1 \ - --hash=sha256:0409aa09b8dae90d5f00ba2d9761e671dfbc54ab169cff8f4cdfecd7f664fd0f \ - --hash=sha256:41f1ed3eadc00540c205a0e897ae0e0fffc21b896e575214f7c5b9c86d2037d1 \ - --hash=sha256:8dcac0bd9df13d63deafb6a61969b832c34467da4a28d2b7abf78066bfce22e6 \ - --hash=sha256:e7df8851c93886412d890d0ecc62b39f42521861ee7a80982136d65903e1f2c5 +pyqt6-qt6==6.6.0 \ + --hash=sha256:1b079a33088d32ff47872cdb37fd15aa42101f0be46c3340244483849b781438 \ + --hash=sha256:8cb30d64a4d32465ea1686bc827cbe452225fb387c4873356b0fa7b9ae63534f \ + --hash=sha256:a151f34712cd645111e89cb30b02e5fb69c9dcc3603ab3c03a561e874bd7cbcf \ + --hash=sha256:e5483ae04bf107411c7469f1be9f9e2eb9840303e788b3ac524fe30af90d45f4 # via # -r requirements.qt6_mac.in # pyqt6 @@ -46,11 +46,11 @@ pyqt6-webengine==6.6.0 \ --hash=sha256:d50b984c3f85e409e692b156132721522d4e8cf9b6c25e0cf927eea2dfb39487 \ --hash=sha256:fded35fba636c4916fec84aa7c6840ad2e75d211462feb3e966f9545a59d56e6 # via -r requirements.qt6_mac.in -pyqt6-webengine-qt6==6.6.1 \ - --hash=sha256:185bd984a094d827d0a1abaf6a17247f87152c335dedbf2ecc4f838e6e2d7656 \ - --hash=sha256:43c75191822823e86164aa5f4299d3a4092af061c27d29b28e75134cfd7b2673 \ - --hash=sha256:4981e36adb15ea6c1508562128caf7d21c7e5c48039b60eabfb44adc00fd25d0 \ - --hash=sha256:605e0f2168f95f9d0903239b28e42a6ba96a48427bda4dad44b192f5e64d63a9 +pyqt6-webengine-qt6==6.6.0 \ + --hash=sha256:4d0eeb8d69eff6776b840c4c2fa13cb6d6aaf84806b01d1f3ee7e994049c9b4e \ + --hash=sha256:8be7c3c5b1694d563f90311cf32c5d919991a5f35f6435bdd0bd10be582eb2a2 \ + --hash=sha256:a78ecb6ba4a0aa92ba4c845067580fd214ea52eed00a92230a877e4bcd1e1ad6 \ + --hash=sha256:d608aef74088433112c212d49455a8fd71708e9ec05aecd22212566657554e30 # via # -r requirements.qt6_mac.in # pyqt6-webengine