Skip to content

Commit

Permalink
page update - fix #25 #22
Browse files Browse the repository at this point in the history
  • Loading branch information
@Fsu0413
Fsu0413 committed May 11, 2024
1 parent c482216 commit 74e2c0c
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 18 deletions.
4 changes: 4 additions & 0 deletions content/Miscellaneous/Histories.en.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
"weight": 4
}

## {{% date 2024 4 17 %}}
Add builds of Qt 6.5 and 6.7, using VS2019.
Rebuild Qt 5.15 / 6.5 / 6.7 using updated VS2017 15.9.61 / VS2019 16.11.35 / VS2022 17.9.6. (except for static builds)

## {{% date 2024 4 13 %}}
Rebuild versions built by NDK r26 series toolchain, using NDK r26d.

Expand Down
4 changes: 4 additions & 0 deletions content/Miscellaneous/Histories.zh-cn.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
"weight": 4
}

## {{% date 2024 4 17 %}}
添加使用 VS2019 构建的 Qt 6.5 和 6.7。
重新构建了 Qt 5.15 / 6.5 / 6.7，使用更新的 VS2017 15.9.61 / VS2019 16.11.35 / VS2022 17.9.6。（静态构建除外）

## {{% date 2024 4 13 %}}
使用 NDK r26d 重新构建所有使用 NDK r26 系列工具链的版本。

Expand Down
3 changes: 2 additions & 1 deletion content/Miscellaneous/NotesForThisRepo.en.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,8 @@ Version number in brackets are the version when the corresponding patch will be
| CVE-2023-45872 | - | [**×**](https://download.qt.io/archive/qt/6.2/CVE-2023-45872-qtsvg-6.2.10.diff "Official patch causes CONFLICT. Reason is unknown and will not be investigated.") (6.2.11) | - |
| CVE-2023-51714 | √ [1](https://download.qt.io/archive/qt/5.15/0001-CVE-2023-51714-qtbase-5.15.diff) [2](https://download.qt.io/archive/qt/5.15/0002-CVE-2023-51714-qtbase-5.15.diff) (5.15.17) | √ [1](https://download.qt.io/archive/qt/6.2/0001-CVE-2023-51714-qtbase-6.2.diff) [2](https://download.qt.io/archive/qt/6.2/0002-CVE-2023-51714-qtbase-6.2.diff) (6.2.11) | √ [1](https://download.qt.io/archive/qt/6.5/0001-CVE-2023-51714-qtbase-6.5.diff) [2](https://download.qt.io/archive/qt/6.5/0002-CVE-2023-51714-qtbase-6.5.diff) (6.5.4) |
| CVE-2024-25580 | [√](https://download.qt.io/archive/qt/5.15/CVE-2024-25580-qtbase-5.15.diff) (5.15.17) | [√](https://download.qt.io/archive/qt/6.2/CVE-2024-25580-qtbase-6.2.diff) (6.2.12) | [√](https://download.qt.io/archive/qt/6.5/CVE-2024-25580-qtbase-6.5.diff) (6.5.5) |
| CVE-2024-30161 | - | - | [**x**](https://download.qt.io/archive/qt/6.5/CVE-2024-30161-qtbase-6.5.diff "Affects 6.5.4 and 6.5.5, not 6.5.3") （6.5.6） |
| CVE-2024-30161 | - | - | [**x**](https://download.qt.io/archive/qt/6.5/CVE-2024-30161-qtbase-6.5.diff "Affects 6.5.4 and 6.5.5, not 6.5.3") (6.5.6) |
| CVE-2024-33861 | - | - | [**x**](https://download.qt.io/archive/qt/6.5/CVE-2024-33861-qtbase-6.5.diff "Not affected. It affects only ICU build of Qt but we are not using ICU") (6.5.6) |

Starting from {{% date 2024 3 12 %}} I provided some simple fixes about build problem.
Currently only LTS version will be patched.
Expand Down
1 change: 1 addition & 0 deletions content/Miscellaneous/NotesForThisRepo.zh-cn.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ Windows 10 已经变得越来越流行，而且添加更多更多的新特性。
| CVE-2023-51714 | √ [1](https://download.qt.io/archive/qt/5.15/0001-CVE-2023-51714-qtbase-5.15.diff) [2](https://download.qt.io/archive/qt/5.15/0002-CVE-2023-51714-qtbase-5.15.diff) （5.15.17） | √ [1](https://download.qt.io/archive/qt/6.2/0001-CVE-2023-51714-qtbase-6.2.diff) [2](https://download.qt.io/archive/qt/6.2/0002-CVE-2023-51714-qtbase-6.2.diff) （6.2.11） | √ [1](https://download.qt.io/archive/qt/6.5/0001-CVE-2023-51714-qtbase-6.5.diff) [2](https://download.qt.io/archive/qt/6.5/0002-CVE-2023-51714-qtbase-6.5.diff) （6.5.4） |
| CVE-2024-25580 | [√](https://download.qt.io/archive/qt/5.15/CVE-2024-25580-qtbase-5.15.diff) （5.15.17） | [√](https://download.qt.io/archive/qt/6.2/CVE-2024-25580-qtbase-6.2.diff) （6.2.12） | [√](https://download.qt.io/archive/qt/6.5/CVE-2024-25580-qtbase-6.5.diff) （6.5.5） |
| CVE-2024-30161 | - | - | [**x**](https://download.qt.io/archive/qt/6.5/CVE-2024-30161-qtbase-6.5.diff "影响 6.5.4 和 6.5.5，不影响 6.5.3") （6.5.6） |
| CVE-2024-33861 | - | - | [**x**](https://download.qt.io/archive/qt/6.5/CVE-2024-33861-qtbase-6.5.diff "咱们不受影响。这个问题只影响附带 ICU 的构建，而咱们的构建不附带 ICU。") （6.5.6） |

从 {{% date 2024 3 12 %}}开始我的 Qt 构建会包含一些简单的关于构建问题的修复。
目前只有 LTS 版本应用这些补丁。
Expand Down
14 changes: 9 additions & 5 deletions content/_index.en.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,21 @@ Thanks for The Qt Company Ltd. and the programmers of Qt for their fantastic wor

## Update History

### {{% date 2024 5 12 %}}
Rebuild all Qt 6 static builds. Remove OpenSSL builtin from these versions.
Reason is that it is [Repo](https://github.com/Fsu0413/QtCompile/issues/25)[rted](https://github.com/Fsu0413/QtCompile/issues/22) that Qt won't be working without OpenSSL header file.

Rebuild versions (except for Qt 6.7) built by llvm-mingw 18 series toolchain, using llvm-mingw 18.1.5.

Rebuild Qt 5.15 MinGW (GCC 11.2.0 and later, LLVM all) versions, fixed a problem which causes that the MySQL (MariaDB) plugin wasn't built.

### {{% date 2024 4 19 %}}
Update Qt 6.2.8.
Rebuild versions built by llvm-mingw 18 series toolchain, using llvm-mingw 18.1.4.

Remove "Qt 6 support platforms" section from notes since there is nothing we are planning for Qt 6 build right now.
Initial version of Qt 6.0 has released for more than 3 years, and all targets planned for build has achieved. This section have no future use.

### {{% date 2024 4 17 %}}
Add builds of Qt 6.5 and 6.7, using VS2019.
Rebuild Qt 5.15 / 6.5 / 6.7 using updated VS2017 15.9.61 / VS2019 16.11.35 / VS2022 17.9.6. (except for static builds)

### Before {{% date 2024 4 13 %}}
### Before {{% date 2024 4 17 %}}

[Here](/Miscellaneous/Histories)
14 changes: 9 additions & 5 deletions content/_index.zh-cn.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,21 @@ __这些包为“依原样”提供。我对您使用此二进制文件作出的

## 更新记录

### {{% date 2024 5 12 %}}
重新构建了所有的 Qt 6 静态版本。删掉了里面的内置 OpenSSL。
原因是有[报](https://github.com/Fsu0413/QtCompile/issues/25)[告](https://github.com/Fsu0413/QtCompile/issues/22)说没了 OpenSSL 的头文件，Qt 用不了。

使用 llvm-mingw 18.1.5 重新构建除 Qt 6.7 外的使用 llvm-mingw 18 系列工具链的版本。

重新构建了 Qt 5.15 MinGW （GCC 11.2.0 及以后，LLVM 的所有）版本，修复一个导致 MySQL （MariaDB）插件没有构建的问题。

### {{% date 2024 4 19 %}}
更新 Qt 6.2.8。
使用 llvm-mingw 18.1.4 重新构建所有使用 llvm-mingw 18 系列工具链的版本。

鉴于现在已经没有更多计划的 Qt 6 构建，我把“Qt 6 支持的平台”章节从备注页中删掉了。
最初的 Qt 6.0 已经发布超过 3 年了，所有计划的构建目标都已经达成了。这个章节已经没用了。

### {{% date 2024 4 17 %}}
添加使用 VS2019 构建的 Qt 6.5 和 6.7。
重新构建了 Qt 5.15 / 6.5 / 6.7，使用更新的 VS2017 15.9.61 / VS2019 16.11.35 / VS2022 17.9.6。（静态构建除外）

### {{% date 2024 4 13 %}}以前
### {{% date 2024 4 17 %}}以前

[这里](/Miscellaneous/Histories)
2 changes: 1 addition & 1 deletion data
Submodule data updated 4 files
+4 −4 Fsu0413MariaDBBuilds.json
+2 −2 Fsu0413OpenSSLBuilds.json
+52 −52 Fsu0413QtBuilds.json
+4 −4 MinGWAddr.json
6 changes: 3 additions & 3 deletions i18n/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,13 @@
"other": "Since Qt 6.2 Qt made TLS backends as plugin. \nFollowing backend(s) are built in the package:\n"
},
"fsqtbuild_i18n_qt6tls_openssl3": {
"other": "OpenSSL 3.0 series using `-DFEATURE_openssl=ON -DINPUT_openssl=linked` for enabling linked OpenSSL support"
"other": "OpenSSL 3.0 series using `-DFEATURE_openssl=ON -DINPUT_openssl=linked` for enabling linked OpenSSL support (Dynamic builds only)"
},
"fsqtbuild_i18n_qt6tls_openssl31": {
"other": "OpenSSL 3.1 series using `-DFEATURE_openssl=ON -DINPUT_openssl=linked` for enabling linked OpenSSL support"
"other": "OpenSSL 3.1 series using `-DFEATURE_openssl=ON -DINPUT_openssl=linked` for enabling linked OpenSSL support (Dynamic builds only)"
},
"fsqtbuild_i18n_qt6tls_openssl32": {
"other": "OpenSSL 3.2 series using `-DFEATURE_openssl=ON -DINPUT_openssl=linked` for enabling linked OpenSSL support"
"other": "OpenSSL 3.2 series using `-DFEATURE_openssl=ON -DINPUT_openssl=linked` for enabling linked OpenSSL support (Dynamic builds only)"
},
"fsqtbuild_i18n_qt6tls_schannel": {
"other": "Windows Secure Channel using `-DFEATURE_schannel=ON` with TLS 1.3 support on MSVC version"
Expand Down
6 changes: 3 additions & 3 deletions i18n/zh-cn.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,13 @@
"other": "从 Qt 6.2 开始 Qt 将 TLS 后端改成插件的形式。 \n这个版本包含下列后端：\n"
},
"fsqtbuild_i18n_qt6tls_openssl3": {
"other": "OpenSSL 3.0 系列，使用 `-DFEATURE_openssl=ON -DINPUT_openssl=linked` 来启用链接的 OpenSSL 支持"
"other": "OpenSSL 3.0 系列，使用 `-DFEATURE_openssl=ON -DINPUT_openssl=linked` 来启用链接的 OpenSSL 支持（仅动态构建）"
},
"fsqtbuild_i18n_qt6tls_openssl31": {
"other": "OpenSSL 3.1 系列，使用 `-DFEATURE_openssl=ON -DINPUT_openssl=linked` 来启用链接的 OpenSSL 支持"
"other": "OpenSSL 3.1 系列，使用 `-DFEATURE_openssl=ON -DINPUT_openssl=linked` 来启用链接的 OpenSSL 支持（仅动态构建）"
},
"fsqtbuild_i18n_qt6tls_openssl32": {
"other": "OpenSSL 3.2 系列，使用 `-DFEATURE_openssl=ON -DINPUT_openssl=linked` 来启用链接的 OpenSSL 支持"
"other": "OpenSSL 3.2 系列，使用 `-DFEATURE_openssl=ON -DINPUT_openssl=linked` 来启用链接的 OpenSSL 支持（仅动态构建）"
},
"fsqtbuild_i18n_qt6tls_schannel": {
"other": "Windows Secure Channel，使用 `-DFEATURE_schannel=ON`。在 MSVC 版本中支持 TLS 1.3"
Expand Down

0 comments on commit 74e2c0c

Please sign in to comment.