Skip to content

Commit

Permalink
Merge bitcoin#31186: msvc: Update vcpkg manifest
Browse files Browse the repository at this point in the history
f6577b7 build, msvc: Update vcpkg manifest baseline (Hennadii Stepanov)
16e1601 build, msvc: Document `libevent` version pinning (Hennadii Stepanov)
ec47cd2 build, msvc: Drop no longer needed `liblzma` version pinning (Hennadii Stepanov)
9a0734d build, msvc: Reorder keys in `vcpkg.json` (Hennadii Stepanov)

Pull request description:

  This PR updates the vcpkg manifest baseline from the [2023.08.09 Release ](https://github.com/microsoft/vcpkg/releases/tag/2023.08.09) to the [2024.09.30 Release](https://github.com/microsoft/vcpkg/releases/tag/2024.09.30), with the following package changes:
  - `boost`: 1.82.0#2 --> 1.85.0#1,2
  - `qt5`: 5.15.10#5 -> 5.15.15
  - `sqlite3`: 3.42.0#1 --> 3.46.1
  - `zeromq`: 2023-06-20#1 --> 4.3.5#2

  The previous update was made in bitcoin#28938.

  For additional minor improvements, please refer to the commit messages.

ACKs for top commit:
  fanquake:
    ACK f6577b7

Tree-SHA512: bfd6f995d97cd3222573ac1c3626c13ee68cf3e2de344869a2d91775090d60f63ef2b17d9a59eba46620eedd51d6787aebe3aeed1189ec55379211a186c21b4e
  • Loading branch information
fanquake committed Nov 5, 2024
2 parents d338872 + f6577b7 commit 65b1941
Showing 1 changed file with 43 additions and 25 deletions.
68 changes: 43 additions & 25 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,64 @@
{
"$comment": "The builtin-baseline corresponds to 2024.09.30 Release",
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"builtin-baseline": "9edb1b8e590cc086563301d735cae4b6e732d2d2",
"overrides":[
{"name": "libevent", "version": "2.1.12#7"},
{"name": "liblzma", "version": "5.4.1#1"}
],
"builtin-baseline": "c82f74667287d3dc386bce81e44964370c91a289",
"dependencies": [
"boost-date-time",
"boost-multi-index",
"boost-signals2",
"libevent"
],
"default-features": [
"wallet",
"zeromq",
"qt5",
"tests",
"qt5"
"wallet",
"zeromq"
],
"features": {
"wallet": {
"description": "Enable wallet",
"dependencies": [ "berkeleydb", "sqlite3" ]
},
"sqlite": {
"description": "Enable SQLite wallet support",
"dependencies": [ "sqlite3" ]
},
"berkeleydb": {
"description": "Enable Berkeley DB wallet support",
"dependencies": [ "berkeleydb" ]
"dependencies": [
"berkeleydb"
]
},
"zeromq": {
"description": "Enable ZMQ notifications",
"dependencies": [ "zeromq" ]
"qt5": {
"description": "Build GUI, Qt 5",
"dependencies": [
"qt5-base",
"qt5-tools"
]
},
"sqlite": {
"description": "Enable SQLite wallet support",
"dependencies": [
"sqlite3"
]
},
"tests": {
"description": "Build test_bitcoin.exe executable",
"dependencies": [ "boost-test" ]
"dependencies": [
"boost-test"
]
},
"qt5": {
"description": "Build GUI, Qt 5",
"dependencies": [ "qt5-base", "qt5-tools" ]
"wallet": {
"description": "Enable wallet",
"dependencies": [
"berkeleydb",
"sqlite3"
]
},
"zeromq": {
"description": "Enable ZMQ notifications",
"dependencies": [
"zeromq"
]
}
},
"overrides": [
{
"$comment": "Newer unreleased libevent versions cause https://github.com/bitcoin/bitcoin/issues/30096",
"name": "libevent",
"version": "2.1.12#7"
}
}
]
}

0 comments on commit 65b1941

Please sign in to comment.