From 58f487407ad897f84703594c77651fffd7bf1a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Tassoux?= <contact@rt2.fr>
Date: Wed, 19 Oct 2022 03:28:51 +0200
Subject: [PATCH] [catch2] Update to 3.1.1 (#27282)

* [catch2] Update to 3.1.1

* [catch2] Update version files
---
 ports/catch2/fix-install-path.patch | 15 ++++++-------
 ports/catch2/fix-uwp-build.patch    | 34 -----------------------------
 ports/catch2/portfile.cmake         |  6 ++---
 ports/catch2/vcpkg.json             |  3 +--
 versions/baseline.json              |  4 ++--
 versions/c-/catch2.json             |  5 +++++
 6 files changed, 17 insertions(+), 50 deletions(-)
 delete mode 100644 ports/catch2/fix-uwp-build.patch

diff --git a/ports/catch2/fix-install-path.patch b/ports/catch2/fix-install-path.patch
index 5813ffe81c..add2a19a40 100644
--- a/ports/catch2/fix-install-path.patch
+++ b/ports/catch2/fix-install-path.patch
@@ -1,7 +1,7 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -170,7 +170,7 @@
+@@ -164,7 +164,7 @@
  
      ## Provide some pkg-config integration
      set(PKGCONFIG_INSTALL_DIR
@@ -13,20 +13,19 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -356,12 +356,28 @@
+@@ -363,16 +363,28 @@
      install(
        TARGETS
          Catch2
 -        Catch2WithMain
        EXPORT
          Catch2Targets
--      DESTINATION
-+      LIBRARY DESTINATION
+       LIBRARY DESTINATION 
          ${CMAKE_INSTALL_LIBDIR}
-+      ARCHIVE DESTINATION
-+        ${CMAKE_INSTALL_LIBDIR}
-+      RUNTIME DESTINATION
-+        ${CMAKE_INSTALL_BINDIR}
+       ARCHIVE DESTINATION
+         ${CMAKE_INSTALL_LIBDIR}
+       RUNTIME DESTINATION
+         ${CMAKE_INSTALL_BINDIR}
      )
 +
 +     install(
diff --git a/ports/catch2/fix-uwp-build.patch b/ports/catch2/fix-uwp-build.patch
deleted file mode 100644
index feee34cfba..0000000000
--- a/ports/catch2/fix-uwp-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp
-index 4465831d..7555a21f 100644
---- a/src/catch2/catch_config.cpp
-+++ b/src/catch2/catch_config.cpp
-@@ -26,7 +26,12 @@ namespace {
- #        pragma warning( disable : 4996 )
- #    endif
- 
-+#    if defined( WINAPI_FAMILY )
-+        // UWP doesn't support environment variables.
-+        return false;
-+#    else
-         return std::getenv( "BAZEL_TEST" ) != nullptr;
-+#    endif
- 
- #    if defined( _MSC_VER )
- #        pragma warning( pop )
-@@ -81,6 +86,8 @@ namespace Catch {
-             } );
-         }
- 
-+#if !defined( WINAPI_FAMILY )
-+    // UWP doesn't support environment variables.
-     if(provideBazelReporterOutput()){
-             // Register a JUnit reporter for Bazel. Bazel sets an environment
-             // variable with the path to XML output. If this file is written to
-@@ -102,6 +109,7 @@ namespace Catch {
-                     { "junit", std::string( bazelOutputFilePtr ), {}, {} } );
-             }
-     }
-+#endif
- 
- 
-         // We now fixup the reporter specs to handle default output spec,
diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
index 7e786c9dc2..c92af313b5 100644
--- a/ports/catch2/portfile.cmake
+++ b/ports/catch2/portfile.cmake
@@ -1,4 +1,3 @@
-
 if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 endif()
@@ -6,12 +5,11 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO catchorg/Catch2
-    REF v3.1.0
-    SHA512 49e5339263190a6ef15284ef2dcc9e727ce0659cb750d4078024ccf6c6f339740a3a662273718ea73adfbc5928c3ef7268175ebda5ee9ec97ca58fed98747b44
+    REF v3.1.1
+    SHA512 d056c8bad8407364debff9f626c7f8255eb64e0faf6dc7fba3d7e14ed29a7e59bd45d92d7b3819bb67d6299a2024f5949c755995d98e94c9bb3d2013709e57ef
     HEAD_REF devel
     PATCHES
         fix-install-path.patch
-        fix-uwp-build.patch
 )
 
 vcpkg_cmake_configure(
diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json
index cf338398a2..d59b522f24 100644
--- a/ports/catch2/vcpkg.json
+++ b/ports/catch2/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "catch2",
-  "version-semver": "3.1.0",
-  "port-version": 1,
+  "version-semver": "3.1.1",
   "description": "A modern, header-only test framework for unit testing.",
   "homepage": "https://github.com/catchorg/Catch2",
   "license": "BSL-1.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index fdbe75361f..78ffb842e4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1313,8 +1313,8 @@
       "port-version": 1
     },
     "catch2": {
-      "baseline": "3.1.0",
-      "port-version": 1
+      "baseline": "3.1.1",
+      "port-version": 0
     },
     "cccapstone": {
       "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e",
diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json
index 3e448c8ef8..7138979064 100644
--- a/versions/c-/catch2.json
+++ b/versions/c-/catch2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "44a94453e68878bf44df00e51bae5115dff3baa8",
+      "version-semver": "3.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "286e5ac6cd8702b9b6cf6f486c35cc2516c7950b",
       "version-semver": "3.1.0",