GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 14:32:22 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Upgrade to Qt 6.5 on Windows/Linux

Browse source
This commit is contained in:
Damien Elmes 2023-04-11 16:57:34 +10:00
parent 5f542b895d
commit b1ed4ade9d
7 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/configure/src/bundle.rs
View file

@ -177,7 +177,7 @@ fn setup_primary_venv(build: &mut Build) -> Result<()> {
if cfg!(target_os = "macos") {
"python/requirements.qt6_3.txt"
} else {
"python/requirements.qt6_4.txt"
"python/requirements.qt6_5.txt"
}
];
if cfg!(windows) {

4
build/configure/src/python.rs
View file

@ -21,7 +21,7 @@ pub fn setup_venv(build: &mut Build) -> Result<()> {
let requirements_txt = if cfg!(windows) {
inputs![
"python/requirements.dev.txt",
"python/requirements.qt6_4.txt",
"python/requirements.qt6_5.txt",
"python/requirements.win.txt",
]
} else if cfg!(all(target_os = "linux", target_arch = "aarch64")) {
@ -32,7 +32,7 @@ pub fn setup_venv(build: &mut Build) -> Result<()> {
if cfg!(target_os = "macos") {
"python/requirements.qt6_3.txt"
} else {
"python/requirements.qt6_4.txt"
"python/requirements.qt6_5.txt"
}
]
};

5
python/requirements.qt6_4.in
View file

@ -1,5 +0,0 @@
pyqt6==6.4.0
pyqt6-qt6==6.4.2
pyqt6-webengine==6.4.0
pyqt6-webengine-qt6==6.4.2
pyqt6_sip==13.4.0

51
python/requirements.qt6_4.txt
View file

@ -1,51 +0,0 @@
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.2 \
--hash=sha256:9f07c3c100cb46cca4074965e7494d4df4f0fc016497d5303c1fe135822876e1 \
--hash=sha256:a29b8c858babd523e80c8db5f8fd19792641588ec04eab49af18b7a4423eb99f \
--hash=sha256:c0e91d0275d428496cacff717a9b719c52bfa52b21f124d638b79cc2217bc81e \
--hash=sha256:d19c4e72615762cd6f0b043f23fa5f0b02656091427ce6de1efccd58e10e6a53
# via
# -r requirements.qt6_4.in
# pyqt6
pyqt6-sip==13.4.0 \
--hash=sha256:2694ae67811cefb6ea3ee0e9995755b45e4952f4dcadec8c04300fd828f91c75 \
--hash=sha256:3486914137f5336cff6e10a5e9d52c1e60ff883473938b45f267f794daeacb2f \
--hash=sha256:3ac7e0800180202dcc0c7035ff88c2a6f4a0f5acb20c4a19f71d807d0f7857b7 \
--hash=sha256:3de18c4a32f717a351d560a39f528af24077f5135aacfa8890a2f2d79f0633da \
--hash=sha256:6d87a3ee5872d7511b76957d68a32109352caf3b7a42a01d9ee20032b350d979 \
--hash=sha256:77af9c7e3f50414ec5af9b1534aaf2ba25115ae65aa5ed735111c8ef0884b862 \
--hash=sha256:802b0cfed19900183220c46895c2635f0dd062f2d275a25506423f911ef74db4 \
--hash=sha256:83b446d247a92d119d507dbc94fc1f47389d8118a5b6232a2859951157319a30 \
--hash=sha256:9c5231536e6153071b22175e46e368045fd08d772a90d772a0977d1166c7822c \
--hash=sha256:9e03c780846fd5d71c06e33322fd11a05713d9cd410e3571d069ac9a84077647 \
--hash=sha256:bb4f2e2fdcf3a8dafe4256750bbedd9e7107c4fd8afa9c25be28423c36bb12b8 \
--hash=sha256:cfdcd43e123bd55c155cfe7a33895033e6d25de90a48ed9c25a0ddd0196a810e \
--hash=sha256:d51704d50b82713fd7c928b7deb31e17be239ddac74fc2fd708e52bd21ecea3a \
--hash=sha256:de601187055d684b36ebe6e800a5deacaa55b69d71ad43312b76422cfeae0e12 \
--hash=sha256:e3b17308ca729bcb6d25c01144c6b2e17d40812231c3ef9caaa72a78db2b1069 \
--hash=sha256:fd2df2a9479b8ac858117bd55dc0ec0bd1ce6c8f3486b0cc5e860c0540a8bba0
# 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.2 \
--hash=sha256:071f8c96433c27d10110782dc98cd2d8fee4a9e60fe4ab50e5f2abea48876ae1 \
--hash=sha256:1111a5b580332768b5f4ab08becd639f9298f9a780da59ba2c317f2327e6b191 \
--hash=sha256:4eeeb50a3b92c873996036b168d8b5e42da7db4bef5f7f2de4d863c2958dda5e \
--hash=sha256:e6cbd4193af5d6e7cd82ff2fb04a5d66bc886554bbda00295e9709b0d6447e9d
# via
# -r requirements.qt6_4.in
# pyqt6-webengine

5
python/requirements.qt6_5.in Normal file
View file

@ -0,0 +1,5 @@
pyqt6==6.5.0
pyqt6-qt6==6.5.0
pyqt6-webengine==6.5.0
pyqt6-webengine-qt6==6.5.0
pyqt6_sip==13.5.0

51
python/requirements.qt6_5.txt Normal file
View file

@ -0,0 +1,51 @@
pyqt6==6.5.0 \
--hash=sha256:2b0d9628134811fbfc988d1757111ca8e25cb697f136fa54c969fb1a4d4a61d1 \
--hash=sha256:99ea0e68f548509b7ef97cded0feeaf3dca7d1fe719388569407326be3be38c2 \
--hash=sha256:b97cb4be9b2c8997904ea668cf3b0a4ae5822196f7792590d05ecde6216a9fbc \
--hash=sha256:e3c8289d9a509be897265981b77eb29e64ce29e9d221fdf52545c2c95e819c9b
# via
# -r requirements.qt6_5.in
# pyqt6-webengine
pyqt6-qt6==6.5.0 \
--hash=sha256:1178fcd5e9590fec4261e06a753a8fa028222ec0bd9a0788b3bd37720fbbe6cf \
--hash=sha256:5f40ef19eb632731828283361f800928517650c74c914c093af9a364d6843953 \
--hash=sha256:8c1f898f4d02a31615fe7613a38f82b489fb2c8554965c917d551470731635a8 \
--hash=sha256:9d82d8af986a0eef55905f309fdda4303d1354eba10175824ae62ab6547f7a96
# via
# -r requirements.qt6_5.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_5.in
# pyqt6
# pyqt6-webengine
pyqt6-webengine==6.5.0 \
--hash=sha256:26ff8d3362328bed09f8f1155c48122b83daf35998d6d299de1dbfcd9d4fc47c \
--hash=sha256:45849365b1ba196724dc6a520ceed3ddaca4e9c09da28eac3c448d26cefdf001 \
--hash=sha256:83a7e97a518d4001fb6c22e26a71e28d6d3b38c40ee0cbe21abfa46982b203d3 \
--hash=sha256:8ba9db56c4c181a2a2fab1673ca35e5b63dc69113f085027ddc43c710b6d6ee9
# via -r requirements.qt6_5.in
pyqt6-webengine-qt6==6.5.0 \
--hash=sha256:5acadcc6608df8d9eba385e04ced2fc88e7eb92e366556ee4ac3c57a02c00088 \
--hash=sha256:6f2be9044060ed3e9e0c55e0d8863fae08c815e994bcf17f2ff24945a2264ff7 \
--hash=sha256:8d7eee4e864c89d6865ff95394dec3aa5b6620ac20412d09a313e83a5baaecb5 \
--hash=sha256:ee2300d372cf38bfb2e426e5036f58bfcaf121e460dc7f89913dc7bd6c3c8953
# via
# -r requirements.qt6_5.in
# pyqt6-webengine

2
python/update_python_deps.sh
View file

@ -18,7 +18,7 @@ args="--resolver=backtracking --allow-unsafe --no-header --strip-extras --genera
# during bundle
../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.qt5_14.in
# ../out/pyenv/bin/pip-compile $args $upgrade requirements.qt5_15.in