Skip to content

Commit ff136d0

Browse files
committed
Merge bitcoin/bitcoin#32213: msvc: Update vcpkg manifest
d85895e build, msvc: Build only required `qtbase` features (Hennadii Stepanov) fe5a6dc build, msvc: Update vcpkg manifest baseline (Hennadii Stepanov) Pull request description: This PR: 1. Updates the vcpkg manifest baseline from the [2024.09.30 Release](https://github.com/microsoft/vcpkg/releases/tag/2024.09.30) to the [2025.03.19 Release](https://github.com/microsoft/vcpkg/releases/tag/2025.03.19), with the following package changes: - boost: 1.85.0#1,2 --> 1.87.0 - qtbase: 6.7.2#3 -> 6.8.2#1 - qttools: 6.7.2#1 -> 6.8.2 - sqlite3: 3.46.1 --> 3.49.1 The previous update was made in bitcoin/bitcoin#31186. 3. Explicitly specifies required features for the `qtbase` package, which makes vcpkg skip unused features such as `dnslookup`, `openssl`, etc. ACKs for top commit: hodlinator: ACK d85895e Tree-SHA512: e05fb50825c6ba2e0caf8ded1dfb55fa42f28f06dcd28597f748c1843a1c4cc888e62ad87b6481c66481a576fa224dd4943fe76e286ff579c6d4dc2ec6a78a71
2 parents 055254e + d85895e commit ff136d0

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

vcpkg.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"$comment": "The builtin-baseline corresponds to 2024.09.30 Release",
2+
"$comment": "The builtin-baseline corresponds to 2025.03.19 Release",
33
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
4-
"builtin-baseline": "c82f74667287d3dc386bce81e44964370c91a289",
4+
"builtin-baseline": "b02e341c927f16d991edbd915d8ea43eac52096c",
55
"dependencies": [
66
"boost-multi-index",
77
"boost-signals2",
@@ -24,7 +24,17 @@
2424
"qt": {
2525
"description": "Build GUI, Qt 6",
2626
"dependencies": [
27-
"qtbase",
27+
{
28+
"name": "qtbase",
29+
"default-features": false,
30+
"features": [
31+
"gui",
32+
"network",
33+
"png",
34+
"testlib",
35+
"widgets"
36+
]
37+
},
2838
"qttools",
2939
"libqrencode"
3040
]

0 commit comments

Comments
 (0)