From bd897b14c3481ecd8b0a38c179f766f69b03336e Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Wed, 15 Mar 2023 16:41:12 +0800
Subject: [PATCH 01/21] [lunasvg] Add usage

---
 ports/lunasvg/fix-cmake.patch | 38 +++++++++++++++++++++++++++++++++++
 ports/lunasvg/portfile.cmake  |  2 ++
 ports/lunasvg/vcpkg.json      |  1 +
 3 files changed, 41 insertions(+)
 create mode 100644 ports/lunasvg/fix-cmake.patch

diff --git a/ports/lunasvg/fix-cmake.patch b/ports/lunasvg/fix-cmake.patch
new file mode 100644
index 00000000000000..c7bf770f3ba6f9
--- /dev/null
+++ b/ports/lunasvg/fix-cmake.patch
@@ -0,0 +1,38 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fd0c42a..8d36cc9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,4 +25,21 @@ if(LUNASVG_BUILD_EXAMPLES)
+ endif()
+ 
+ set_target_properties(lunasvg PROPERTIES PUBLIC_HEADER "include/lunasvg.h")
+-install(TARGETS lunasvg RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include)
++
++install(TARGETS lunasvg
++    EXPORT unofficial-lunasvg-target
++    RUNTIME DESTINATION bin
++    LIBRARY DESTINATION lib
++    ARCHIVE DESTINATION lib)
++
++install(TARGETS lunasvg PUBLIC_HEADER DESTINATION include)
++
++install( EXPORT unofficial-lunasvg-target FILE unofficial-lunasvg-target.cmake NAMESPACE unofficial::lunasvg:: DESTINATION share/unofficial-lunasvg)
++
++file( WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-lunasvg-config.cmake.in"
++[[
++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-lunasvg-target.cmake")
++]])
++
++configure_file( "${CMAKE_CURRENT_BINARY_DIR}/unofficial-lunasvg-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-lunasvg-config.cmake" @ONLY)
++install( FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-lunasvg-config.cmake" DESTINATION share/unofficial-lunasvg)
+diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
+index de58954..74149dc 100644
+--- a/include/CMakeLists.txt
++++ b/include/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ target_include_directories(lunasvg
+ PUBLIC
+-    "${CMAKE_CURRENT_LIST_DIR}"
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
++    $<INSTALL_INTERFACE:include>
+ )
diff --git a/ports/lunasvg/portfile.cmake b/ports/lunasvg/portfile.cmake
index 9b40c58421d863..7ded9de621943d 100644
--- a/ports/lunasvg/portfile.cmake
+++ b/ports/lunasvg/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
   HEAD_REF master
   PATCHES
     fix-install.patch
+    fix-cmake.patch
 )
 
 vcpkg_cmake_configure(
@@ -19,6 +20,7 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/lunasvg/vcpkg.json b/ports/lunasvg/vcpkg.json
index df3d8aaa0769f1..881071a2caaf7c 100644
--- a/ports/lunasvg/vcpkg.json
+++ b/ports/lunasvg/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "lunasvg",
   "version": "2.3.1",
+  "port-version": 1,
   "description": "lunasvg is a standalone SVG rendering library in C++",
   "homepage": "https://github.com/sammycage/lunasvg",
   "license": "MIT",

From b8dd047f38ab3b4767ce19d1d44afc4b53ccbe4e Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Wed, 15 Mar 2023 16:41:38 +0800
Subject: [PATCH 02/21] update version

---
 versions/baseline.json   | 2 +-
 versions/l-/lunasvg.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 4149c350b29cd6..f01809550665e8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4866,7 +4866,7 @@
     },
     "lunasvg": {
       "baseline": "2.3.1",
-      "port-version": 0
+      "port-version": 1
     },
     "luv": {
       "baseline": "1.44.2",
diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json
index fb076139e32d59..5280ce95c61b6b 100644
--- a/versions/l-/lunasvg.json
+++ b/versions/l-/lunasvg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b30698daa0fae7114bd08f0f9bcd50242920560b",
+      "version": "2.3.1",
+      "port-version": 1
+    },
     {
       "git-tree": "bf20380ca537151f7d1e02a6ca5b19c302db18c7",
       "version": "2.3.1",

From 23b0330f85998c8208526f8dd2fa4f3a71702f3f Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Wed, 15 Mar 2023 18:45:45 +0800
Subject: [PATCH 03/21] update cmake

---
 ports/lunasvg/fix-cmake.patch | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/ports/lunasvg/fix-cmake.patch b/ports/lunasvg/fix-cmake.patch
index c7bf770f3ba6f9..852e47e38f577b 100644
--- a/ports/lunasvg/fix-cmake.patch
+++ b/ports/lunasvg/fix-cmake.patch
@@ -1,30 +1,23 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd0c42a..8d36cc9 100644
+index fd0c42a..bb2833f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -25,4 +25,21 @@ if(LUNASVG_BUILD_EXAMPLES)
+@@ -24,5 +24,13 @@ if(LUNASVG_BUILD_EXAMPLES)
+     add_subdirectory(example)
  endif()
  
- set_target_properties(lunasvg PROPERTIES PUBLIC_HEADER "include/lunasvg.h")
+-set_target_properties(lunasvg PROPERTIES PUBLIC_HEADER "include/lunasvg.h")
 -install(TARGETS lunasvg RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include)
-+
 +install(TARGETS lunasvg
-+    EXPORT unofficial-lunasvg-target
++    EXPORT unofficial-lunasvg-config
 +    RUNTIME DESTINATION bin
 +    LIBRARY DESTINATION lib
-+    ARCHIVE DESTINATION lib)
-+
-+install(TARGETS lunasvg PUBLIC_HEADER DESTINATION include)
-+
-+install( EXPORT unofficial-lunasvg-target FILE unofficial-lunasvg-target.cmake NAMESPACE unofficial::lunasvg:: DESTINATION share/unofficial-lunasvg)
++    ARCHIVE DESTINATION lib
++    PUBLIC_HEADER DESTINATION include)
 +
-+file( WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-lunasvg-config.cmake.in"
-+[[
-+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-lunasvg-target.cmake")
-+]])
++install( EXPORT unofficial-lunasvg-config NAMESPACE unofficial::lunasvg:: DESTINATION share/unofficial-lunasvg)
 +
-+configure_file( "${CMAKE_CURRENT_BINARY_DIR}/unofficial-lunasvg-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-lunasvg-config.cmake" @ONLY)
-+install( FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-lunasvg-config.cmake" DESTINATION share/unofficial-lunasvg)
++install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include" DESTINATION include)
 diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
 index de58954..74149dc 100644
 --- a/include/CMakeLists.txt

From 626f7ec8f09017fe0eca1efa6b87f5ffd166d803 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Wed, 15 Mar 2023 18:46:15 +0800
Subject: [PATCH 04/21] update version

---
 versions/l-/lunasvg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json
index 5280ce95c61b6b..946c09336e0a76 100644
--- a/versions/l-/lunasvg.json
+++ b/versions/l-/lunasvg.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "b30698daa0fae7114bd08f0f9bcd50242920560b",
+      "git-tree": "cd8dad6cfa437f640c26e7a791636fc075bcc940",
       "version": "2.3.1",
       "port-version": 1
     },

From caa60df0fa83c71a2faedd78ccfac5f2f8d615c9 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Wed, 15 Mar 2023 18:58:03 +0800
Subject: [PATCH 05/21] update patch

---
 ports/lunasvg/fix-cmake.patch | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/ports/lunasvg/fix-cmake.patch b/ports/lunasvg/fix-cmake.patch
index 852e47e38f577b..05c8e10ed3b782 100644
--- a/ports/lunasvg/fix-cmake.patch
+++ b/ports/lunasvg/fix-cmake.patch
@@ -1,23 +1,15 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd0c42a..bb2833f 100644
+index fd0c42a..229e33e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -24,5 +24,13 @@ if(LUNASVG_BUILD_EXAMPLES)
-     add_subdirectory(example)
+@@ -25,4 +25,6 @@ if(LUNASVG_BUILD_EXAMPLES)
  endif()
  
--set_target_properties(lunasvg PROPERTIES PUBLIC_HEADER "include/lunasvg.h")
+ set_target_properties(lunasvg PROPERTIES PUBLIC_HEADER "include/lunasvg.h")
 -install(TARGETS lunasvg RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include)
-+install(TARGETS lunasvg
-+    EXPORT unofficial-lunasvg-config
-+    RUNTIME DESTINATION bin
-+    LIBRARY DESTINATION lib
-+    ARCHIVE DESTINATION lib
-+    PUBLIC_HEADER DESTINATION include)
++install(TARGETS lunasvg EXPORT unofficial-lunasvg-config RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include)
 +
-+install( EXPORT unofficial-lunasvg-config NAMESPACE unofficial::lunasvg:: DESTINATION share/unofficial-lunasvg)
-+
-+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include" DESTINATION include)
++install(EXPORT unofficial-lunasvg-config NAMESPACE unofficial::lunasvg:: DESTINATION share/unofficial-lunasvg)
 diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
 index de58954..74149dc 100644
 --- a/include/CMakeLists.txt

From db6c8fe2bf388d8f01fe0d0894447abe1f738698 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Wed, 15 Mar 2023 18:58:21 +0800
Subject: [PATCH 06/21] update version

---
 versions/l-/lunasvg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json
index 946c09336e0a76..be1cd38f83e3c8 100644
--- a/versions/l-/lunasvg.json
+++ b/versions/l-/lunasvg.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "cd8dad6cfa437f640c26e7a791636fc075bcc940",
+      "git-tree": "13503fb11aa6cd985c3e58a93d5d081a1fff810d",
       "version": "2.3.1",
       "port-version": 1
     },

From ab8af17c69f58b4753803af9aadb68a6f56beece Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 16 Mar 2023 13:52:16 +0800
Subject: [PATCH 07/21] optimize portfile.cmake

---
 ports/lunasvg/portfile.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/lunasvg/portfile.cmake b/ports/lunasvg/portfile.cmake
index 7ded9de621943d..aa95aedf14b1d4 100644
--- a/ports/lunasvg/portfile.cmake
+++ b/ports/lunasvg/portfile.cmake
@@ -18,9 +18,10 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-lunasvg PACKAGE_NAME unofficial-lunasvg)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

From 74887e48c2b4bdd633af9ade233fac2fc93e2419 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 16 Mar 2023 13:52:47 +0800
Subject: [PATCH 08/21] update version

---
 versions/l-/lunasvg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json
index be1cd38f83e3c8..105efd85dc03fc 100644
--- a/versions/l-/lunasvg.json
+++ b/versions/l-/lunasvg.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "13503fb11aa6cd985c3e58a93d5d081a1fff810d",
+      "git-tree": "03eb78698ee53b190c57728db5aaef1a9d7b0350",
       "version": "2.3.1",
       "port-version": 1
     },

From 94183b3edbe52259c28361474db7b140d2129d90 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 16 Mar 2023 14:19:57 +0800
Subject: [PATCH 09/21] update cmake_function

---
 ports/lunasvg/portfile.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/lunasvg/portfile.cmake b/ports/lunasvg/portfile.cmake
index aa95aedf14b1d4..7e690bb8dfbaee 100644
--- a/ports/lunasvg/portfile.cmake
+++ b/ports/lunasvg/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO sammycage/lunasvg
-  REF e612abda858b53160041381a23422cd2b4f42fbd #2.3.1
-  SHA512 44f5d013d918cb5af90114a12857bdd2c204caff761516ef98b12b08d8b6215e91f6d963c281500c386f287b9d0ecd5b3d986d4c8c33423c0c34d539d744e09d
+  REF "v${VERSION}"
+  SHA512 b1843ad1a0d93a304c6d14978c40191ff15e8a1074ec2bea41da79882a2692bbe5dec0a49c4c33881c56d7e5331ff38d1e66f33d0dd8d351e8c2847e077b1565
   HEAD_REF master
   PATCHES
     fix-install.patch
@@ -18,7 +18,7 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-lunasvg PACKAGE_NAME unofficial-lunasvg)
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lunasvg)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

From 6f93b16a5428f7c51bde453aa587f17333c5f022 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 16 Mar 2023 14:20:16 +0800
Subject: [PATCH 10/21] update version

---
 versions/l-/lunasvg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json
index 105efd85dc03fc..13b9fed83f1ce3 100644
--- a/versions/l-/lunasvg.json
+++ b/versions/l-/lunasvg.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "03eb78698ee53b190c57728db5aaef1a9d7b0350",
+      "git-tree": "80b32a072320378c14ed7ee1f0fa5665186df70b",
       "version": "2.3.1",
       "port-version": 1
     },

From b6a9dd7fa0997e402402c64a644ff2a9a4a8ef09 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Fri, 5 May 2023 15:26:43 +0800
Subject: [PATCH 11/21] [lunasvg] update to latest commit fix issue

---
 ports/lunasvg/fix-cmake.patch   | 23 -----------------------
 ports/lunasvg/fix-install.patch | 26 --------------------------
 ports/lunasvg/portfile.cmake    |  9 +++------
 ports/lunasvg/vcpkg.json        |  3 +--
 4 files changed, 4 insertions(+), 57 deletions(-)
 delete mode 100644 ports/lunasvg/fix-cmake.patch
 delete mode 100644 ports/lunasvg/fix-install.patch

diff --git a/ports/lunasvg/fix-cmake.patch b/ports/lunasvg/fix-cmake.patch
deleted file mode 100644
index 05c8e10ed3b782..00000000000000
--- a/ports/lunasvg/fix-cmake.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd0c42a..229e33e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,4 +25,6 @@ if(LUNASVG_BUILD_EXAMPLES)
- endif()
- 
- set_target_properties(lunasvg PROPERTIES PUBLIC_HEADER "include/lunasvg.h")
--install(TARGETS lunasvg RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include)
-+install(TARGETS lunasvg EXPORT unofficial-lunasvg-config RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include)
-+
-+install(EXPORT unofficial-lunasvg-config NAMESPACE unofficial::lunasvg:: DESTINATION share/unofficial-lunasvg)
-diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
-index de58954..74149dc 100644
---- a/include/CMakeLists.txt
-+++ b/include/CMakeLists.txt
-@@ -1,4 +1,5 @@
- target_include_directories(lunasvg
- PUBLIC
--    "${CMAKE_CURRENT_LIST_DIR}"
-+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
-+    $<INSTALL_INTERFACE:include>
- )
diff --git a/ports/lunasvg/fix-install.patch b/ports/lunasvg/fix-install.patch
deleted file mode 100644
index 73b63487540d6b..00000000000000
--- a/ports/lunasvg/fix-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
- CMakeLists.txt | 15 ++-------------
- 1 file changed, 2 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9916c67..159f3a6 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,16 +24,5 @@ if(LUNASVG_BUILD_EXAMPLES)
-     add_subdirectory(example)
- endif()
- 
--set(LUNASVG_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
--set(LUNASVG_INCDIR ${CMAKE_INSTALL_PREFIX}/include)
--
--install(FILES
--    include/lunasvg.h
--    DESTINATION ${LUNASVG_INCDIR}
--)
--
--install(TARGETS lunasvg
--    LIBRARY     DESTINATION    ${LUNASVG_LIBDIR}
--    ARCHIVE     DESTINATION    ${LUNASVG_LIBDIR}
--    INCLUDES    DESTINATION    ${LUNASVG_INCDIR}
--)
-+set_target_properties(lunasvg PROPERTIES PUBLIC_HEADER "include/lunasvg.h")
-+install(TARGETS lunasvg RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include)
diff --git a/ports/lunasvg/portfile.cmake b/ports/lunasvg/portfile.cmake
index 7e690bb8dfbaee..c751957941f2f1 100644
--- a/ports/lunasvg/portfile.cmake
+++ b/ports/lunasvg/portfile.cmake
@@ -1,12 +1,9 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO sammycage/lunasvg
-  REF "v${VERSION}"
-  SHA512 b1843ad1a0d93a304c6d14978c40191ff15e8a1074ec2bea41da79882a2692bbe5dec0a49c4c33881c56d7e5331ff38d1e66f33d0dd8d351e8c2847e077b1565
+  REF f924651b85cac47dbe15f51a4aa320461fc1d07b
+  SHA512 519ca76a02da8faa4d07e6fc8a0db32c75c5b9abbe3584664037f02760e667e487248c0a445cd8ca5b0add0828cc1e0922a9c8a0aea52558d4fa083f6ae802f7
   HEAD_REF master
-  PATCHES
-    fix-install.patch
-    fix-cmake.patch
 )
 
 vcpkg_cmake_configure(
@@ -18,7 +15,7 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lunasvg)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/lunasvg)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/ports/lunasvg/vcpkg.json b/ports/lunasvg/vcpkg.json
index 881071a2caaf7c..6cb40a342e1029 100644
--- a/ports/lunasvg/vcpkg.json
+++ b/ports/lunasvg/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "lunasvg",
-  "version": "2.3.1",
-  "port-version": 1,
+  "version-date": "2023-05-05",
   "description": "lunasvg is a standalone SVG rendering library in C++",
   "homepage": "https://github.com/sammycage/lunasvg",
   "license": "MIT",

From 56a93fa8f2a1b0d4bf45599f345eb3ae3a357bfc Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Fri, 5 May 2023 15:28:06 +0800
Subject: [PATCH 12/21] update version

---
 versions/baseline.json   | 4 ++--
 versions/l-/lunasvg.json | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index f01809550665e8..f139cd6c3010b8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4865,8 +4865,8 @@
       "port-version": 1
     },
     "lunasvg": {
-      "baseline": "2.3.1",
-      "port-version": 1
+      "baseline": "2023-05-05",
+      "port-version": 0
     },
     "luv": {
       "baseline": "1.44.2",
diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json
index 13b9fed83f1ce3..cc18e22ed2e5ee 100644
--- a/versions/l-/lunasvg.json
+++ b/versions/l-/lunasvg.json
@@ -1,9 +1,9 @@
 {
   "versions": [
     {
-      "git-tree": "80b32a072320378c14ed7ee1f0fa5665186df70b",
-      "version": "2.3.1",
-      "port-version": 1
+      "git-tree": "5f5d399d7721ef3edb31eb6629197f82b84bc417",
+      "version-date": "2023-05-05",
+      "port-version": 0
     },
     {
       "git-tree": "bf20380ca537151f7d1e02a6ca5b19c302db18c7",

From 51b7419e2a4cf12be1113fd923bd50dfa01a1e24 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Fri, 5 May 2023 18:54:31 +0800
Subject: [PATCH 13/21] update version

---
 ports/lunasvg/portfile.cmake | 2 +-
 ports/lunasvg/vcpkg.json     | 2 +-
 versions/l-/lunasvg.json     | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ports/lunasvg/portfile.cmake b/ports/lunasvg/portfile.cmake
index c751957941f2f1..dc3056fda093b9 100644
--- a/ports/lunasvg/portfile.cmake
+++ b/ports/lunasvg/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO sammycage/lunasvg
-  REF f924651b85cac47dbe15f51a4aa320461fc1d07b
+  REF f924651b85cac47dbe15f51a4aa320461fc1d07b   #version 2.3.1+20230331
   SHA512 519ca76a02da8faa4d07e6fc8a0db32c75c5b9abbe3584664037f02760e667e487248c0a445cd8ca5b0add0828cc1e0922a9c8a0aea52558d4fa083f6ae802f7
   HEAD_REF master
 )
diff --git a/ports/lunasvg/vcpkg.json b/ports/lunasvg/vcpkg.json
index 6cb40a342e1029..9360011ebe46e8 100644
--- a/ports/lunasvg/vcpkg.json
+++ b/ports/lunasvg/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "lunasvg",
-  "version-date": "2023-05-05",
+  "version": "2.3.1+20230331",
   "description": "lunasvg is a standalone SVG rendering library in C++",
   "homepage": "https://github.com/sammycage/lunasvg",
   "license": "MIT",
diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json
index cc18e22ed2e5ee..fb076139e32d59 100644
--- a/versions/l-/lunasvg.json
+++ b/versions/l-/lunasvg.json
@@ -1,10 +1,5 @@
 {
   "versions": [
-    {
-      "git-tree": "5f5d399d7721ef3edb31eb6629197f82b84bc417",
-      "version-date": "2023-05-05",
-      "port-version": 0
-    },
     {
       "git-tree": "bf20380ca537151f7d1e02a6ca5b19c302db18c7",
       "version": "2.3.1",

From ad41693328fdb0d36a3b864db0551e0de64b667b Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Fri, 5 May 2023 18:54:53 +0800
Subject: [PATCH 14/21] update version

---
 versions/baseline.json   | 2 +-
 versions/l-/lunasvg.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 15bc4d35621013..8c1ec06d6db4a2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4957,7 +4957,7 @@
       "port-version": 1
     },
     "lunasvg": {
-      "baseline": "2023-05-05",
+      "baseline": "2.3.1+20230331",
       "port-version": 0
     },
     "luv": {
diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json
index fb076139e32d59..9f6f6da1f68545 100644
--- a/versions/l-/lunasvg.json
+++ b/versions/l-/lunasvg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "26b00de276e8272254de281244cb386bfe1533c4",
+      "version": "2.3.1+20230331",
+      "port-version": 0
+    },
     {
       "git-tree": "bf20380ca537151f7d1e02a6ca5b19c302db18c7",
       "version": "2.3.1",

From e08021127024700c8621abe9d90f70934eaf32e5 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Sat, 6 May 2023 10:27:53 +0800
Subject: [PATCH 15/21] update version

---
 ports/lunasvg/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/lunasvg/portfile.cmake b/ports/lunasvg/portfile.cmake
index dc3056fda093b9..885d77dd209654 100644
--- a/ports/lunasvg/portfile.cmake
+++ b/ports/lunasvg/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO sammycage/lunasvg
-  REF f924651b85cac47dbe15f51a4aa320461fc1d07b   #version 2.3.1+20230331
+  REF f924651b85cac47dbe15f51a4aa320461fc1d07b #2.3.1+20230331
   SHA512 519ca76a02da8faa4d07e6fc8a0db32c75c5b9abbe3584664037f02760e667e487248c0a445cd8ca5b0add0828cc1e0922a9c8a0aea52558d4fa083f6ae802f7
   HEAD_REF master
 )

From ca851b183cc5cefa297241a5a90d16aa5c59c0e2 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Sat, 6 May 2023 10:29:16 +0800
Subject: [PATCH 16/21] updatre version

---
 versions/l-/lunasvg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json
index 9f6f6da1f68545..77d4914e0b8ef2 100644
--- a/versions/l-/lunasvg.json
+++ b/versions/l-/lunasvg.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "26b00de276e8272254de281244cb386bfe1533c4",
+      "git-tree": "34bcc4f969bfb479ed9cf7749da3308a1a729da6",
       "version": "2.3.1+20230331",
       "port-version": 0
     },

From 6490988252f020038b6e33e47bf9756dc8b25a21 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Tue, 9 May 2023 16:41:02 +0800
Subject: [PATCH 17/21] update version

---
 ports/lunasvg/portfile.cmake | 2 +-
 ports/lunasvg/vcpkg.json     | 2 +-
 versions/l-/lunasvg.json     | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ports/lunasvg/portfile.cmake b/ports/lunasvg/portfile.cmake
index 885d77dd209654..8e6b957ee5e7df 100644
--- a/ports/lunasvg/portfile.cmake
+++ b/ports/lunasvg/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO sammycage/lunasvg
-  REF f924651b85cac47dbe15f51a4aa320461fc1d07b #2.3.1+20230331
+  REF "${VERSION}"
   SHA512 519ca76a02da8faa4d07e6fc8a0db32c75c5b9abbe3584664037f02760e667e487248c0a445cd8ca5b0add0828cc1e0922a9c8a0aea52558d4fa083f6ae802f7
   HEAD_REF master
 )
diff --git a/ports/lunasvg/vcpkg.json b/ports/lunasvg/vcpkg.json
index 9360011ebe46e8..b3cf871924e39f 100644
--- a/ports/lunasvg/vcpkg.json
+++ b/ports/lunasvg/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "lunasvg",
-  "version": "2.3.1+20230331",
+  "version": "2.3.5",
   "description": "lunasvg is a standalone SVG rendering library in C++",
   "homepage": "https://github.com/sammycage/lunasvg",
   "license": "MIT",
diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json
index 77d4914e0b8ef2..fb076139e32d59 100644
--- a/versions/l-/lunasvg.json
+++ b/versions/l-/lunasvg.json
@@ -1,10 +1,5 @@
 {
   "versions": [
-    {
-      "git-tree": "34bcc4f969bfb479ed9cf7749da3308a1a729da6",
-      "version": "2.3.1+20230331",
-      "port-version": 0
-    },
     {
       "git-tree": "bf20380ca537151f7d1e02a6ca5b19c302db18c7",
       "version": "2.3.1",

From 1441badf07d638d9d5c0bedbdd5b265bcadb1a35 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Tue, 9 May 2023 16:41:32 +0800
Subject: [PATCH 18/21] update version

---
 versions/baseline.json   | 2 +-
 versions/l-/lunasvg.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 8c1ec06d6db4a2..b45b130e2895fb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4957,7 +4957,7 @@
       "port-version": 1
     },
     "lunasvg": {
-      "baseline": "2.3.1+20230331",
+      "baseline": "2.3.5",
       "port-version": 0
     },
     "luv": {
diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json
index fb076139e32d59..e6357be56f255d 100644
--- a/versions/l-/lunasvg.json
+++ b/versions/l-/lunasvg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0608957f9041649978218ff8fb14f69f46361f54",
+      "version": "2.3.5",
+      "port-version": 0
+    },
     {
       "git-tree": "bf20380ca537151f7d1e02a6ca5b19c302db18c7",
       "version": "2.3.1",

From 5b47f27ca801355327a17c413dd42c5eb8cc9169 Mon Sep 17 00:00:00 2001
From: Zhao Liu <v-zhli17@microsoft.com>
Date: Mon, 29 May 2023 22:52:33 -0700
Subject: [PATCH 19/21] update lunasvg to 2.3.8

---
 ports/lunasvg/fix-cmake.patch | 31 +++++++++++++++++++++++++++++++
 ports/lunasvg/portfile.cmake  |  8 +++++---
 ports/lunasvg/vcpkg.json      |  2 +-
 3 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 ports/lunasvg/fix-cmake.patch

diff --git a/ports/lunasvg/fix-cmake.patch b/ports/lunasvg/fix-cmake.patch
new file mode 100644
index 00000000000000..b00ea77f2fdd44
--- /dev/null
+++ b/ports/lunasvg/fix-cmake.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ea4b2d2..f622d45 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,10 @@ install(FILES
+ )
+ 
+ install(TARGETS lunasvg
+-    LIBRARY     DESTINATION    ${LUNASVG_LIBDIR}
+-    ARCHIVE     DESTINATION    ${LUNASVG_LIBDIR}
+-    INCLUDES    DESTINATION    ${LUNASVG_INCDIR}
+-)
++    EXPORT unofficial-lunasvg-config
++    RUNTIME DESTINATION bin
++    LIBRARY DESTINATION lib
++    ARCHIVE DESTINATION lib
++    PUBLIC_HEADER DESTINATION include)
++
++install(EXPORT unofficial-lunasvg-config NAMESPACE unofficial::lunasvg:: DESTINATION share/unofficial-lunasvg)
+\ No newline at end of file
+diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
+index de58954..74149dc 100644
+--- a/include/CMakeLists.txt
++++ b/include/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ target_include_directories(lunasvg
+ PUBLIC
+-    "${CMAKE_CURRENT_LIST_DIR}"
++    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
++    $<INSTALL_INTERFACE:include>
+ )
diff --git a/ports/lunasvg/portfile.cmake b/ports/lunasvg/portfile.cmake
index 8e6b957ee5e7df..199792591f93ec 100644
--- a/ports/lunasvg/portfile.cmake
+++ b/ports/lunasvg/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO sammycage/lunasvg
-  REF "${VERSION}"
-  SHA512 519ca76a02da8faa4d07e6fc8a0db32c75c5b9abbe3584664037f02760e667e487248c0a445cd8ca5b0add0828cc1e0922a9c8a0aea52558d4fa083f6ae802f7
+  REF "v${VERSION}"
+  SHA512 368f76ae3c04fbcb08406d9e7793af37b5e28ab90ffe0978fae8783620a45af3270fcd4e895c553e3e651f0ba07e37355acffd9f0aab1bf9ef822f465de21073
   HEAD_REF master
+  PATCHES
+    fix-cmake.patch
 )
 
 vcpkg_cmake_configure(
@@ -15,7 +17,7 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/lunasvg)
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lunasvg)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/ports/lunasvg/vcpkg.json b/ports/lunasvg/vcpkg.json
index b3cf871924e39f..1e55ed9194cc15 100644
--- a/ports/lunasvg/vcpkg.json
+++ b/ports/lunasvg/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "lunasvg",
-  "version": "2.3.5",
+  "version": "2.3.8",
   "description": "lunasvg is a standalone SVG rendering library in C++",
   "homepage": "https://github.com/sammycage/lunasvg",
   "license": "MIT",

From 81cac2fe3d702ff5fe26274c5b90400b24715102 Mon Sep 17 00:00:00 2001
From: Zhao Liu <v-zhli17@microsoft.com>
Date: Mon, 29 May 2023 22:54:49 -0700
Subject: [PATCH 20/21] update version

---
 versions/baseline.json   | 2 +-
 versions/l-/lunasvg.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index b45b130e2895fb..391ec138fb09d5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4957,7 +4957,7 @@
       "port-version": 1
     },
     "lunasvg": {
-      "baseline": "2.3.5",
+      "baseline": "2.3.8",
       "port-version": 0
     },
     "luv": {
diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json
index e6357be56f255d..817a96b891b1dc 100644
--- a/versions/l-/lunasvg.json
+++ b/versions/l-/lunasvg.json
@@ -1,8 +1,8 @@
 {
   "versions": [
     {
-      "git-tree": "0608957f9041649978218ff8fb14f69f46361f54",
-      "version": "2.3.5",
+      "git-tree": "1179c2b190b44c73df63e24019f477cb6435909e",
+      "version": "2.3.8",
       "port-version": 0
     },
     {

From 39cbdcc0dc3978071b42ccf8fefc2f94c500f758 Mon Sep 17 00:00:00 2001
From: Zhao Liu <v-zhli17@microsoft.com>
Date: Thu, 13 Jul 2023 00:05:53 -0700
Subject: [PATCH 21/21] update version

---
 versions/baseline.json   | 2 +-
 versions/l-/lunasvg.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 5518f368ba1e37..32ed183f13216e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5082,7 +5082,7 @@
     },
     "lunasvg": {
       "baseline": "2.3.8",
-      "port-version": 0
+      "port-version": 1
     },
     "luv": {
       "baseline": "1.44.2",
diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json
index 0453ae520eea59..8e0936fd1b000b 100644
--- a/versions/l-/lunasvg.json
+++ b/versions/l-/lunasvg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "27a82fac0168f7e17be4e9b8981833ed381197dc",
+      "version": "2.3.8",
+      "port-version": 1
+    },
     {
       "git-tree": "064296e0fbadcd3113e5ee2a65202614c9125acc",
       "version": "2.3.8",