From 9a0734df5f1ba22388c81abfa66035c20241800b Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:06:44 +0000
Subject: [PATCH 1/4] build, msvc: Reorder keys in `vcpkg.json`

This change ensures that any further manipulation of `vcpkg.json` via
the `vcpkg` command will produce minimal diffs.
---
 vcpkg.json | 72 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 26 deletions(-)

diff --git a/vcpkg.json b/vcpkg.json
index 6343ca4eb3..e26a8d9ea2 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,10 +1,6 @@
 {
   "$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"}
-  ],
   "dependencies": [
     "boost-date-time",
     "boost-multi-index",
@@ -12,35 +8,59 @@
     "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" ]
-    },
-    "zeromq": {
-      "description": "Enable ZMQ notifications",
-      "dependencies": [ "zeromq" ]
-    },
-    "tests": {
-      "description": "Build test_bitcoin.exe executable",
-      "dependencies": [ "boost-test" ]
+      "dependencies": [
+        "berkeleydb"
+      ]
     },
     "qt5": {
       "description": "Build GUI, Qt 5",
-      "dependencies": [ "qt5-base", "qt5-tools" ]
+      "dependencies": [
+        "qt5-base",
+        "qt5-tools"
+      ]
+    },
+    "sqlite": {
+      "description": "Enable SQLite wallet support",
+      "dependencies": [
+        "sqlite3"
+      ]
+    },
+    "tests": {
+      "description": "Build test_bitcoin.exe executable",
+      "dependencies": [
+        "boost-test"
+      ]
+    },
+    "wallet": {
+      "description": "Enable wallet",
+      "dependencies": [
+        "berkeleydb",
+        "sqlite3"
+      ]
+    },
+    "zeromq": {
+      "description": "Enable ZMQ notifications",
+      "dependencies": [
+        "zeromq"
+      ]
     }
-  }
+  },
+  "overrides": [
+    {
+      "name": "libevent",
+      "version": "2.1.12#7"
+    },
+    {
+      "name": "liblzma",
+      "version": "5.4.1#1"
+    }
+  ]
 }

From ec47cd2b5084de0bbe5a731bdd519d9d41048695 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:07:02 +0000
Subject: [PATCH 2/4] build, msvc: Drop no longer needed `liblzma` version
 pinning

For historical context, see https://github.com/hebasto/bitcoin/pull/140.
---
 vcpkg.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/vcpkg.json b/vcpkg.json
index e26a8d9ea2..6ffc330201 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -57,10 +57,6 @@
     {
       "name": "libevent",
       "version": "2.1.12#7"
-    },
-    {
-      "name": "liblzma",
-      "version": "5.4.1#1"
     }
   ]
 }

From 16e16013bfa0871dd6cb2fc1f05774a43d83bab7 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:07:15 +0000
Subject: [PATCH 3/4] build, msvc: Document `libevent` version pinning

---
 vcpkg.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vcpkg.json b/vcpkg.json
index 6ffc330201..3285223b05 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -55,6 +55,7 @@
   },
   "overrides": [
     {
+      "$comment": "Newer unreleased libevent versions cause https://github.com/bitcoin/bitcoin/issues/30096",
       "name": "libevent",
       "version": "2.1.12#7"
     }

From f6577b717416191e65ba8221be57f1a48d74e5d7 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:10:17 +0000
Subject: [PATCH 4/4] build, msvc: Update vcpkg manifest baseline

The `"$comment"` field is positioned at the top, as it will be
automatically placed there during any processing of this file by
`vcpkg.exe`.
---
 vcpkg.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vcpkg.json b/vcpkg.json
index 3285223b05..f7b15f9c68 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,6 +1,7 @@
 {
+  "$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",
+  "builtin-baseline": "c82f74667287d3dc386bce81e44964370c91a289",
   "dependencies": [
     "boost-date-time",
     "boost-multi-index",