From c1f21baeaf7127c13ee141fe1bdaa49eed371c0c Mon Sep 17 00:00:00 2001
From: Sean Farrell <sean.farrell@rioki.org>
Date: Tue, 3 Mar 2026 18:15:02 +0100
Subject: [PATCH] [fkyaml] fix natvis install issue for downstream ports
 (#50265)

---
 ports/fkyaml/fix-natvis-install.patch | 30 +++++++++++++++++++++++++++
 ports/fkyaml/fix-natvis-path.patch    | 13 ------------
 ports/fkyaml/portfile.cmake           |  2 +-
 ports/fkyaml/vcpkg.json               |  1 +
 versions/baseline.json                |  2 +-
 versions/f-/fkyaml.json               |  5 +++++
 6 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 ports/fkyaml/fix-natvis-install.patch
 delete mode 100644 ports/fkyaml/fix-natvis-path.patch

diff --git a/ports/fkyaml/fix-natvis-install.patch b/ports/fkyaml/fix-natvis-install.patch
new file mode 100644
index 0000000000..ba6dbd84ac
--- /dev/null
+++ b/ports/fkyaml/fix-natvis-install.patch
@@ -0,0 +1,30 @@
+ CMakeLists.txt | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9c2b923..7e7d447 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,11 +79,12 @@ target_include_directories(
+ if(MSVC)
+   set(FK_YAML_INSTALL_NATVIS ON)
+   set(FK_YAML_NATVIS_FILE ${FK_YAML_TARGET_NAME}.natvis)
++  set(FK_YAML_NATVIS_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}")
+   target_sources(
+     ${FK_YAML_TARGET_NAME}
+     INTERFACE
+       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${FK_YAML_NATVIS_FILE}>
+-      $<INSTALL_INTERFACE:${FK_YAML_NATVIS_FILE}>
++      $<INSTALL_INTERFACE:${FK_YAML_NATVIS_INSTALL_DIR}/${FK_YAML_NATVIS_FILE}>
+ )
+ endif()
+ 
+@@ -171,7 +172,7 @@ if(FK_YAML_INSTALL)
+   if(FK_YAML_INSTALL_NATVIS)
+     install(
+       FILES ${FK_YAML_NATVIS_FILE}
+-      DESTINATION .
++      DESTINATION "${FK_YAML_NATVIS_INSTALL_DIR}"
+     )
+   endif()
+ 
diff --git a/ports/fkyaml/fix-natvis-path.patch b/ports/fkyaml/fix-natvis-path.patch
deleted file mode 100644
index ba39a4d33a..0000000000
--- a/ports/fkyaml/fix-natvis-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b1a8b81..59c9464 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -190,7 +190,7 @@ if(FK_YAML_INSTALL)
-   if(FK_YAML_INSTALL_NATVIS)
-     install(
-       FILES ${FK_YAML_NATVIS_FILE}
--      DESTINATION .
-+      DESTINATION share/fkyaml
-     )
-   endif()
- 
diff --git a/ports/fkyaml/portfile.cmake b/ports/fkyaml/portfile.cmake
index 30edbc7b14..a744f8fa10 100644
--- a/ports/fkyaml/portfile.cmake
+++ b/ports/fkyaml/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     SHA512 20a7e2a236f77e27a676348585cbf6c36d8c46f1ad0964b879eb61925e3d6545d6dda46379b897712890faa2b8d5e837b7f9cc312448a3d762f0017c618cbcd1
     HEAD_REF develop
     PATCHES
-        fix-natvis-path.patch
+        fix-natvis-install.patch
 )
 
 set(VCPKG_BUILD_TYPE release) # header-only port
diff --git a/ports/fkyaml/vcpkg.json b/ports/fkyaml/vcpkg.json
index 08e75e034b..7a174cfe56 100644
--- a/ports/fkyaml/vcpkg.json
+++ b/ports/fkyaml/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "fkyaml",
   "version": "0.4.2",
+  "port-version": 1,
   "description": "A C++ header-only YAML library",
   "homepage": "https://github.com/fktn-k/fkYAML",
   "license": "MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index aca6f0dfb0..b7ab815603 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3026,7 +3026,7 @@
     },
     "fkyaml": {
       "baseline": "0.4.2",
-      "port-version": 0
+      "port-version": 1
     },
     "flagpp": {
       "baseline": "3.1.0",
diff --git a/versions/f-/fkyaml.json b/versions/f-/fkyaml.json
index 37073f9177..18f6625f73 100644
--- a/versions/f-/fkyaml.json
+++ b/versions/f-/fkyaml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "19fa1243ae8b6aaabf8a727b91ede01b6428545b",
+      "version": "0.4.2",
+      "port-version": 1
+    },
     {
       "git-tree": "21138b93a764b6ba43549ceb71ff28b5aecd9ea6",
       "version": "0.4.2",