mirror of
https://github.com/ankitects/anki.git
synced 2025-09-19 14:32:22 -04:00
Revert Windows build to Qt 6.4; update to 6.4.3
Multiple users have reported that 6.5 is behaving sluggishly https://forums.ankiweb.net/t/anki-2-1-62-beta/29302/9
This commit is contained in:
parent
a3e09f421b
commit
8abcb77d95
5 changed files with 64 additions and 4 deletions
|
@ -174,7 +174,11 @@ const QT5_VENV: Venv = Venv {
|
||||||
fn setup_primary_venv(build: &mut Build) -> Result<()> {
|
fn setup_primary_venv(build: &mut Build) -> Result<()> {
|
||||||
let mut qt6_reqs = inputs![
|
let mut qt6_reqs = inputs![
|
||||||
"python/requirements.bundle.txt",
|
"python/requirements.bundle.txt",
|
||||||
"python/requirements.qt6_5.txt"
|
if cfg!(windows) {
|
||||||
|
"python/requirements.qt6_4.txt"
|
||||||
|
} else {
|
||||||
|
"python/requirements.qt6_5.txt"
|
||||||
|
}
|
||||||
];
|
];
|
||||||
if cfg!(windows) {
|
if cfg!(windows) {
|
||||||
qt6_reqs = inputs![qt6_reqs, "python/requirements.win.txt"];
|
qt6_reqs = inputs![qt6_reqs, "python/requirements.win.txt"];
|
||||||
|
|
|
@ -21,7 +21,7 @@ pub fn setup_venv(build: &mut Build) -> Result<()> {
|
||||||
let requirements_txt = if cfg!(windows) {
|
let requirements_txt = if cfg!(windows) {
|
||||||
inputs![
|
inputs![
|
||||||
"python/requirements.dev.txt",
|
"python/requirements.dev.txt",
|
||||||
"python/requirements.qt6_5.txt",
|
"python/requirements.qt6_4.txt",
|
||||||
"python/requirements.win.txt",
|
"python/requirements.win.txt",
|
||||||
]
|
]
|
||||||
} else if cfg!(all(target_os = "linux", target_arch = "aarch64")) {
|
} else if cfg!(all(target_os = "linux", target_arch = "aarch64")) {
|
||||||
|
@ -29,7 +29,7 @@ pub fn setup_venv(build: &mut Build) -> Result<()> {
|
||||||
} else {
|
} else {
|
||||||
inputs![
|
inputs![
|
||||||
"python/requirements.dev.txt",
|
"python/requirements.dev.txt",
|
||||||
"python/requirements.qt6_5.txt"
|
"python/requirements.qt6_5.txt",
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
build.add(
|
build.add(
|
||||||
|
|
5
python/requirements.qt6_4.in
Normal file
5
python/requirements.qt6_4.in
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
pyqt6==6.4.0
|
||||||
|
pyqt6-qt6==6.4.3
|
||||||
|
pyqt6-webengine==6.4.0
|
||||||
|
pyqt6-webengine-qt6==6.4.3
|
||||||
|
pyqt6_sip==13.5.0
|
51
python/requirements.qt6_4.txt
Normal file
51
python/requirements.qt6_4.txt
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
pyqt6==6.4.0 \
|
||||||
|
--hash=sha256:37e399420866fff5c5bd49f56710dffd3a7a126afc6612b877d666f381bd554f \
|
||||||
|
--hash=sha256:79d093ce97010eac92e83a4e8efe231328af9ec757ba78c77e46ca1e007eca0d \
|
||||||
|
--hash=sha256:8e614cc4b95dec8bec8ba3c3eaf821058b45862e66d69a8c4fb5576123f2be98 \
|
||||||
|
--hash=sha256:91392469be1f491905fa9e78fa4e4059a89ab616ddf2ecfd525bc1d65c26bb93
|
||||||
|
# via
|
||||||
|
# -r requirements.qt6_4.in
|
||||||
|
# pyqt6-webengine
|
||||||
|
pyqt6-qt6==6.4.3 \
|
||||||
|
--hash=sha256:27cc19976c872ae7111fcab8a9e9eae8c5ec5e55bfb6938a379551148b85f5b0 \
|
||||||
|
--hash=sha256:96f30cca49af18f6863c66576b90f2f29987dc35397994d0575b197226c5b328 \
|
||||||
|
--hash=sha256:b0151097aa93235676c0f83ce23916ee31ca8584bd1b45923725068404542cc2 \
|
||||||
|
--hash=sha256:b133bbc53e1cc05aafd78bfd3a577826481a976021d041c1c57d7dadc7de1c11
|
||||||
|
# via
|
||||||
|
# -r requirements.qt6_4.in
|
||||||
|
# pyqt6
|
||||||
|
pyqt6-sip==13.5.0 \
|
||||||
|
--hash=sha256:1d79d1c557d35747feef11e943723d9a662a819070fedf96e85920bfd5ad48d1 \
|
||||||
|
--hash=sha256:1ffb48367e0a8bcfe6142c039a433905d606785f7085c3dff3f7801f0afd9fec \
|
||||||
|
--hash=sha256:289c37bf808ecc110c6f85afe29083f90170dbdfb76db412281acabefc0b7ede \
|
||||||
|
--hash=sha256:2cbc73dd3a2e0d6669b47fbf0ed5494a3cda996a2d0db465eea2a825a0c12733 \
|
||||||
|
--hash=sha256:34e9d5a6f2d77fd7829ce93f59406193547dc77316b63a979bf8de84bb2d7d97 \
|
||||||
|
--hash=sha256:42e802b99293eff99061115b122801574682b950c2f01e68ac14162f35239bce \
|
||||||
|
--hash=sha256:447c0df1c8796d2dbb9e5c1cef2ba2a59a38a2bce2fa438246c096a52530f331 \
|
||||||
|
--hash=sha256:5a12a24ca84c482a8baa07081f73e11cee17c0c9220021319eada087d2ea8267 \
|
||||||
|
--hash=sha256:61c702b7f81796a27c294ba76f1cba3408161f06deb801373c42670ed36f722a \
|
||||||
|
--hash=sha256:640011d5642ee94dce6cfde234631830ca7164bef138772c4ad05b80dcb88e10 \
|
||||||
|
--hash=sha256:6e72061953b0bd07d6b41c710bb654788ca61a8f336d169b59c96fd15fdf681a \
|
||||||
|
--hash=sha256:6fed31d93b2ee8115621f2aeb686068ad1b75084df6af5262c4a1818064014d6 \
|
||||||
|
--hash=sha256:bf705dbbf77029c682234cdaa78970899d9d49b40b7b2d942b2af4f0f6c6d566 \
|
||||||
|
--hash=sha256:c69072f4afc8e75799d3166f5d3b405eaa7bba998f61e3c8f0dd3a78a234015c \
|
||||||
|
--hash=sha256:cd56a17e51bc84203219023e956ac42ba8aa4195adb1126476f0cb751a22e986 \
|
||||||
|
--hash=sha256:ee6a198346f1d9e2b675232b6d19d1517652594d7fdc72bb32d0bced6cb2e08d
|
||||||
|
# via
|
||||||
|
# -r requirements.qt6_4.in
|
||||||
|
# pyqt6
|
||||||
|
# pyqt6-webengine
|
||||||
|
pyqt6-webengine==6.4.0 \
|
||||||
|
--hash=sha256:3f17c7b41cceaf7bdeec69121b4ff211b43f62e4a7e89c7143124a4eb3fc9da2 \
|
||||||
|
--hash=sha256:4c71c130860abcd11e04cafb22e33983fa9a3aee8323c51909b15a1701828e21 \
|
||||||
|
--hash=sha256:7f6cde52b7b8c00ef2a1522ad92cde66f2bd3a3066646efe4ef96a4907b1b1cd \
|
||||||
|
--hash=sha256:9658919bc1c5279a6fae9e6990448dfe483e136e957e6fb14e8f6265f4e9d1da
|
||||||
|
# via -r requirements.qt6_4.in
|
||||||
|
pyqt6-webengine-qt6==6.4.3 \
|
||||||
|
--hash=sha256:8a43a75ddf9936ad6e5b23a04862665a93e26b17b829f1fd1c70728c2774c93e \
|
||||||
|
--hash=sha256:b7d7bb7497f28a42c6b1790edc952d68f5981ee02fb3e774122e69677aad880f \
|
||||||
|
--hash=sha256:c220b8db4839a9c16102ac2d52cef9a0eab9142a873d7444529b5c2a4906ca30 \
|
||||||
|
--hash=sha256:c9cb28464216584c97e6a55b601bf99525e3164c31ed8d6f438ce684846b3a38
|
||||||
|
# via
|
||||||
|
# -r requirements.qt6_4.in
|
||||||
|
# pyqt6-webengine
|
|
@ -17,7 +17,7 @@ args="--resolver=backtracking --allow-unsafe --no-header --strip-extras --genera
|
||||||
|
|
||||||
# during bundle
|
# during bundle
|
||||||
../out/pyenv/bin/pip-compile $args $upgrade requirements.bundle.in
|
../out/pyenv/bin/pip-compile $args $upgrade requirements.bundle.in
|
||||||
#../out/pyenv/bin/pip-compile $args $upgrade requirements.qt6_3.in
|
#../out/pyenv/bin/pip-compile $args $upgrade requirements.qt6_4.in
|
||||||
../out/pyenv/bin/pip-compile $args $upgrade requirements.qt6_5.in
|
../out/pyenv/bin/pip-compile $args $upgrade requirements.qt6_5.in
|
||||||
# ../out/pyenv/bin/pip-compile $args $upgrade requirements.qt5_14.in
|
# ../out/pyenv/bin/pip-compile $args $upgrade requirements.qt5_14.in
|
||||||
# ../out/pyenv/bin/pip-compile $args $upgrade requirements.qt5_15.in
|
# ../out/pyenv/bin/pip-compile $args $upgrade requirements.qt5_15.in
|
||||||
|
|
Loading…
Reference in a new issue