From 63cc705ef071ae1159f7a47933789da26dae6e38 Mon Sep 17 00:00:00 2001
From: miyanyan <40262194+miyanyan@users.noreply.github.com>
Date: Tue, 7 May 2024 03:42:40 +0800
Subject: [PATCH] [catch2] update to 3.6.0 (#38586)

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [ ] The "supports" clause reflects platforms that may be fixed by this
new version.
- [ ] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
---
 ports/catch2/fix-arm-build.patch | 15 ---------------
 ports/catch2/portfile.cmake      |  3 +--
 ports/catch2/vcpkg.json          |  2 +-
 versions/baseline.json           |  2 +-
 versions/c-/catch2.json          |  5 +++++
 5 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 ports/catch2/fix-arm-build.patch

diff --git a/ports/catch2/fix-arm-build.patch b/ports/catch2/fix-arm-build.patch
deleted file mode 100644
index 9224c8714d..0000000000
--- a/ports/catch2/fix-arm-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/catch2/internal/catch_random_integer_helpers.hpp b/src/catch2/internal/catch_random_integer_helpers.hpp
---- a/src/catch2/internal/catch_random_integer_helpers.hpp
-+++ b/src/catch2/internal/catch_random_integer_helpers.hpp
-@@ -21,7 +21,10 @@
- //       it, and it provides an escape hatch to the users who need it.
- #if defined( __SIZEOF_INT128__ )
- #    define CATCH_CONFIG_INTERNAL_UINT128
--#elif defined( _MSC_VER ) && ( defined( _WIN64 ) || defined( _M_ARM64 ) )
-+// Unlike GCC, MSVC does not polyfill umul as mulh + mul pair on ARM machines.
-+// Currently we do not bother doing this ourselves, but we could if it became
-+// important for perf.
-+#elif defined( _MSC_VER ) && defined( _WIN64 ) && !defined( _M_ARM64 )
- #    define CATCH_CONFIG_INTERNAL_MSVC_UMUL128
- #endif
- 
diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
index b10f802784..57d8480f25 100644
--- a/ports/catch2/portfile.cmake
+++ b/ports/catch2/portfile.cmake
@@ -6,11 +6,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO catchorg/Catch2
     REF v${VERSION}
-    SHA512 c22ad6a2fbf8665b8775d72dcdc6bfde324eb224fcd897ebce5e62c7ac7640823550198fff45e1ea548a5923db4392ce7009ff784ef78bd59356a2aae5337976
+    SHA512 09c728a04d69b0692d6e2f7ceb5889dc69309406c27f7f2b5d383245a5357657c5540dd64a7a4a6e19388bda68105002425286468578b69b20e3a75366871ce2
     HEAD_REF devel
     PATCHES
         fix-install-path.patch
-        fix-arm-build.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json
index dcb8a3f682..29b887d6bb 100644
--- a/ports/catch2/vcpkg.json
+++ b/ports/catch2/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "catch2",
-  "version-semver": "3.5.4",
+  "version-semver": "3.6.0",
   "description": "A modern, C++-native, test framework for unit-tests, TDD and BDD.",
   "homepage": "https://github.com/catchorg/Catch2",
   "license": "BSL-1.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 207cfc666b..3dc9805d66 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1497,7 +1497,7 @@
       "port-version": 2
     },
     "catch2": {
-      "baseline": "3.5.4",
+      "baseline": "3.6.0",
       "port-version": 0
     },
     "cblas": {
diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json
index c0c82121df..316586d983 100644
--- a/versions/c-/catch2.json
+++ b/versions/c-/catch2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f61acaeefdf6127fa878f7192fc109fa8e1a0135",
+      "version-semver": "3.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "79536429a52319190e793f8ec7c19c6142b26bd4",
       "version-semver": "3.5.4",