Skip to content

Commit 65b1941

Browse files
committed
Merge bitcoin/bitcoin#31186: msvc: Update vcpkg manifest
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/bitcoin#28938. For additional minor improvements, please refer to the commit messages. ACKs for top commit: fanquake: ACK f6577b7 Tree-SHA512: bfd6f995d97cd3222573ac1c3626c13ee68cf3e2de344869a2d91775090d60f63ef2b17d9a59eba46620eedd51d6787aebe3aeed1189ec55379211a186c21b4e
2 parents d338872 + f6577b7 commit 65b1941

File tree

1 file changed

+43
-25
lines changed

1 file changed

+43
-25
lines changed

vcpkg.json

+43-25
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,64 @@
11
{
2+
"$comment": "The builtin-baseline corresponds to 2024.09.30 Release",
23
"$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-
],
4+
"builtin-baseline": "c82f74667287d3dc386bce81e44964370c91a289",
85
"dependencies": [
96
"boost-date-time",
107
"boost-multi-index",
118
"boost-signals2",
129
"libevent"
1310
],
1411
"default-features": [
15-
"wallet",
16-
"zeromq",
12+
"qt5",
1713
"tests",
18-
"qt5"
14+
"wallet",
15+
"zeromq"
1916
],
2017
"features": {
21-
"wallet": {
22-
"description": "Enable wallet",
23-
"dependencies": [ "berkeleydb", "sqlite3" ]
24-
},
25-
"sqlite": {
26-
"description": "Enable SQLite wallet support",
27-
"dependencies": [ "sqlite3" ]
28-
},
2918
"berkeleydb": {
3019
"description": "Enable Berkeley DB wallet support",
31-
"dependencies": [ "berkeleydb" ]
20+
"dependencies": [
21+
"berkeleydb"
22+
]
3223
},
33-
"zeromq": {
34-
"description": "Enable ZMQ notifications",
35-
"dependencies": [ "zeromq" ]
24+
"qt5": {
25+
"description": "Build GUI, Qt 5",
26+
"dependencies": [
27+
"qt5-base",
28+
"qt5-tools"
29+
]
30+
},
31+
"sqlite": {
32+
"description": "Enable SQLite wallet support",
33+
"dependencies": [
34+
"sqlite3"
35+
]
3636
},
3737
"tests": {
3838
"description": "Build test_bitcoin.exe executable",
39-
"dependencies": [ "boost-test" ]
39+
"dependencies": [
40+
"boost-test"
41+
]
4042
},
41-
"qt5": {
42-
"description": "Build GUI, Qt 5",
43-
"dependencies": [ "qt5-base", "qt5-tools" ]
43+
"wallet": {
44+
"description": "Enable wallet",
45+
"dependencies": [
46+
"berkeleydb",
47+
"sqlite3"
48+
]
49+
},
50+
"zeromq": {
51+
"description": "Enable ZMQ notifications",
52+
"dependencies": [
53+
"zeromq"
54+
]
55+
}
56+
},
57+
"overrides": [
58+
{
59+
"$comment": "Newer unreleased libevent versions cause https://github.com/bitcoin/bitcoin/issues/30096",
60+
"name": "libevent",
61+
"version": "2.1.12#7"
4462
}
45-
}
63+
]
4664
}

0 commit comments

Comments
 (0)