From 0a50c9623b797eb393ca852099bc3b776c34b532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabien=20P=C3=A9an?= <fabien@pean.pro>
Date: Mon, 18 Sep 2023 19:12:53 +0200
Subject: [PATCH] [yomm2] Update to v1.4.0 (#33509)

* [yomm2] Update to version 1.4.0

* [yomm2] v db
---
 ports/yomm2/fix_find_boost.patch | 13 ++++++++++++-
 ports/yomm2/portfile.cmake       | 20 ++++++++++++++++----
 ports/yomm2/vcpkg.json           |  6 ++----
 versions/baseline.json           |  2 +-
 versions/y-/yomm2.json           |  5 +++++
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/ports/yomm2/fix_find_boost.patch b/ports/yomm2/fix_find_boost.patch
index 17fd1bb30b..458d1c6bb6 100644
--- a/ports/yomm2/fix_find_boost.patch
+++ b/ports/yomm2/fix_find_boost.patch
@@ -20,7 +20,18 @@ index 7272504..6423a17 100644
  
  # Tell library users about the Boost dependency
 -find_dependency(Boost 1.53 HINTS ${CMAKE_CURRENT_LIST_DIR}/..)
-+find_dependency(Boost 1.53)
++find_dependency(Boost REQUIRED)
  
  # Add the targets file
  include("${CMAKE_CURRENT_LIST_DIR}/YOMM2Targets.cmake")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7e8a282..f550c2d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -26,6 +29,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+   target_include_directories(
+     yomm2 INTERFACE
+     $<BUILD_INTERFACE:${YOMM2_SOURCE_DIR}/include>
+     $<INSTALL_INTERFACE:include>
+-    $<INSTALL_INTERFACE:Boost::yomm2>
+   )
diff --git a/ports/yomm2/portfile.cmake b/ports/yomm2/portfile.cmake
index 34ff379cf9..8750276bb6 100644
--- a/ports/yomm2/portfile.cmake
+++ b/ports/yomm2/portfile.cmake
@@ -1,17 +1,29 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jll63/yomm2
     REF "v${VERSION}"
-    SHA512  456422f829293339d1d29eda8a00ad1bf5a2b7adcf0eb3727729b25208e1e67bff8187e21d49b64817ebb3a2274cef5504e22d612b1c68de20c8fe458daa81ba
+    SHA512  35d869f79b278ae219d61e0ae3b01902c5df5457d2ced7bfd109cf0e75f3f7835ce3d4751c34838d134531f6483dc89b7d67d5ecab6e8af42b4b735284573db4
     HEAD_REF master
     PATCHES "fix_find_boost.patch"
 )
+
+set(YOMM2_SHARED OFF)
+if(VCPKG_LIBRARY_LINKAGE MATCHES "dynamic")
+    set(YOMM2_SHARED ON)
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS -DYOMM2_ENABLE_EXAMPLES=OFF
+    OPTIONS 
+        -DYOMM2_ENABLE_EXAMPLES=OFF
+        -DYOMM2_SHARED=${YOMM2_SHARED}
 )
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/YOMM2)
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+if(VCPKG_LIBRARY_LINKAGE MATCHES "static") # header only library in static build
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug")
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/yomm2/vcpkg.json b/ports/yomm2/vcpkg.json
index 12eea2b7e7..a710e1ac5e 100644
--- a/ports/yomm2/vcpkg.json
+++ b/ports/yomm2/vcpkg.json
@@ -1,15 +1,13 @@
 {
   "name": "yomm2",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "YOMM2 is an implementation of open multi-methods.",
   "homepage": "https://github.com/jll63/yomm2",
   "license": "BSL-1.0",
   "dependencies": [
     "boost-dynamic-bitset",
-    "boost-integer",
-    "boost-move",
+    "boost-mp11",
     "boost-preprocessor",
-    "boost-type-traits",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/versions/baseline.json b/versions/baseline.json
index 4e34ad6418..30d5f7d115 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -9073,7 +9073,7 @@
       "port-version": 0
     },
     "yomm2": {
-      "baseline": "1.3.1",
+      "baseline": "1.4.0",
       "port-version": 0
     },
     "yyjson": {
diff --git a/versions/y-/yomm2.json b/versions/y-/yomm2.json
index 5c495265de..593221a735 100644
--- a/versions/y-/yomm2.json
+++ b/versions/y-/yomm2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "eb04c5f671a8ba74f8f98bb4c1b53716336ce441",
+      "version": "1.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9b2200dcba64aecc83b9009b7d8f1ccb383003c8",
       "version": "1.3.1",