This PR updates the vcpkg manifest baseline from the 2023.08.09 Release to the 2024.09.30 Release, with the following package changes:
boost: 1.82.0#2 --> 1.85.0#1,2qt5: 5.15.10#5 -> 5.15.15sqlite3: 3.42.0#1 --> 3.46.1zeromq: 2023-06-20#1 --> 4.3.5#2The previous update was made in #28938.
For additional minor improvements, please refer to the commit messages.
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--006a51241073e994b41acfe9ec718e94-->
For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/31186.
<!--021abf342d371248e50ceaed478a90ca-->
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | fanquake |
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
<!--174a7506f384e20aa4161008e828411d-->
Reviewers, this pull request conflicts with the following ones:
FindQRencode module and enable libqrencode package for MSVC by hebasto)If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
Friendly ping @sipsorcery @hodlinator ;)
<details><summary>In 4f06a3648f1c0cc55d86508782a9b236be4d028e:
cat vcpkg.json | jq -S results in a different order, seems more lexicographical to me?
</summary>
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"builtin-baseline": "9edb1b8e590cc086563301d735cae4b6e732d2d2",
"default-features": [
"wallet",
"zeromq",
"tests",
"qt5"
],
"dependencies": [
"boost-date-time",
"boost-multi-index",
"boost-signals2",
"libevent"
],
"features": {
"berkeleydb": {
"dependencies": [
"berkeleydb"
],
"description": "Enable Berkeley DB wallet support"
},
"qt5": {
"dependencies": [
"qt5-base",
"qt5-tools"
],
"description": "Build GUI, Qt 5"
},
"sqlite": {
"dependencies": [
"sqlite3"
],
"description": "Enable SQLite wallet support"
},
"tests": {
"dependencies": [
"boost-test"
],
"description": "Build test_bitcoin.exe executable"
},
"wallet": {
"dependencies": [
"berkeleydb",
"sqlite3"
],
"description": "Enable wallet"
},
"zeromq": {
"dependencies": [
"zeromq"
],
"description": "Enable ZMQ notifications"
}
},
"overrides": [
{
"name": "libevent",
"version": "2.1.12#7"
},
{
"name": "liblzma",
"version": "5.4.1#1"
}
]
}
</summary>
I've dropped mentioning of lexicographical order from the commit message. The goal of the reordering is to minimize diffs for invocations like vcpkg add port libqrencode.
0 | @@ -1,46 +1,64 @@ 1 | { 2 | "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", 3 | - "builtin-baseline": "9edb1b8e590cc086563301d735cae4b6e732d2d2", 4 | - "overrides":[ 5 | - {"name": "libevent", "version": "2.1.12#7"}, 6 | - {"name": "liblzma", "version": "5.4.1#1"} 7 | - ], 8 | + "$comment": "The builtin-baseline corresponds to 2024.09.30 Release",
$comment should appear ordered before $schema, unless the latter must appear first?
~This "$comment" field actually comments the following line~
UPD. Reordered.
Saw that, but it mentions it by name so I thought maybe keeping the lexicographical order the first commit tries to introduce would have precedent.
Tested on Windows 11 Home:
> rmdir /S build
> cmake -B build --preset vs2022-static
> cmake --build build --config Release -j<X>
> build\src\qt\Release\bitcoin-qt.exe (started successfully)
This change ensures that any further manipulation of `vcpkg.json` via
the `vcpkg` command will produce minimal diffs.
For historical context, see https://github.com/hebasto/bitcoin/pull/140.
The `"$comment"` field is positioned at the top, as it will be
automatically placed there during any processing of this file by
`vcpkg.exe`.
ACK f6577b717416191e65ba8221be57f1a48d74e5d7
