[yomm2 ] Bump yomm2 to 1.3.1 (#30028)

Co-authored-by: Ben Southall <bensouthall@smartr.ai> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
microsoft · Apr 19, 2023 · 28dc8b9 · 28dc8b9
1 parent 6d40153
commit 28dc8b9
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 32 deletions.
diff --git a/ports/yomm2/fix_find_boost.patch b/ports/yomm2/fix_find_boost.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b7b88b1..02297e7 100644
+index 7e8a282..f550c2d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -11,7 +11,7 @@ project(YOMM2 VERSION 1.0)
+@@ -15,7 +15,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
  # Find Boost dependency
  list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
  include(find_or_download_package)
@@ -12,7 +12,7 @@ index b7b88b1..02297e7 100644
 
  if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
-index 7272504..9f8b2ae 100644
+index 7272504..6423a17 100644
 --- a/cmake/Config.cmake.in
 +++ b/cmake/Config.cmake.in
 @@ -1,7 +1,7 @@

diff --git a/ports/yomm2/fix_uwp_osx.patch b/ports/yomm2/fix_uwp_osx.patch
diff --git a/ports/yomm2/portfile.cmake b/ports/yomm2/portfile.cmake
@@ -2,10 +2,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jll63/yomm2
-    REF v1.1.2
-    SHA512  f45c3f3d267dedaa3c76f9dab1a75be01941e3715e71b30b878be49157a5ba97f2188c9e635272be3ca396019b161bb21a30199ca504c94a18673685f5dbf06d
+    REF "v${VERSION}"
+    SHA512  456422f829293339d1d29eda8a00ad1bf5a2b7adcf0eb3727729b25208e1e67bff8187e21d49b64817ebb3a2274cef5504e22d612b1c68de20c8fe458daa81ba
     HEAD_REF master
-    PATCHES "fix_find_boost.patch" "fix_uwp_osx.patch"
+    PATCHES "fix_find_boost.patch"
 )
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"

diff --git a/ports/yomm2/vcpkg.json b/ports/yomm2/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "yomm2",
-  "version": "1.1.2",
-  "port-version": 2,
+  "version": "1.3.1",
   "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",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -8697,8 +8697,8 @@
       "port-version": 0
     },
     "yomm2": {
-      "baseline": "1.1.2",
-      "port-version": 2
+      "baseline": "1.3.1",
+      "port-version": 0
     },
     "yyjson": {
       "baseline": "0.6.0",

diff --git a/versions/y-/yomm2.json b/versions/y-/yomm2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9b2200dcba64aecc83b9009b7d8f1ccb383003c8",
+      "version": "1.3.1",
+      "port-version": 0
+    },
     {
       "git-tree": "8bd8a2b21272e70a16c55b55215a7b5f6bd295d3",
       "version": "1.1.2",