From bed2703c1dc690dbcab68ef96edf64b4d52bf977 Mon Sep 17 00:00:00 2001
From: Frank <65999885+FrankXie05@users.noreply.github.com>
Date: Thu, 25 Jul 2024 20:15:37 +0000
Subject: [PATCH] [botan] Update version to 3.5.0 (#40061)

---
 ports/botan/libcxx-winpthread-fixes.patch | 17 ++++-------------
 ports/botan/portfile.cmake                |  4 ++--
 ports/botan/vcpkg.json                    |  3 +--
 versions/b-/botan.json                    |  5 +++++
 versions/baseline.json                    |  4 ++--
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/ports/botan/libcxx-winpthread-fixes.patch b/ports/botan/libcxx-winpthread-fixes.patch
index 2b6b0274b2..bf5ee22ecb 100644
--- a/ports/botan/libcxx-winpthread-fixes.patch
+++ b/ports/botan/libcxx-winpthread-fixes.patch
@@ -1,23 +1,14 @@
+diff --git a/src/tests/tests.h b/src/tests/tests.h
+index d198376..12f001a 100644
 --- a/src/tests/tests.h
 +++ b/src/tests/tests.h
-@@ -17,6 +17,9 @@
+@@ -17,7 +17,9 @@
  #include <map>
  #include <memory>
  #include <optional>
 +#ifndef __ANDROID__
-+#include <ranges>
+ #include <ranges>
 +#endif
  #include <set>
  #include <sstream>
  #include <string>
---- a/src/lib/utils/os_utils.cpp
-+++ b/src/lib/utils/os_utils.cpp
-@@ -627,6 +627,8 @@
-    static_cast<void>(pthread_set_name_np(thread.native_handle(), name.c_str()));
-    #elif defined(BOTAN_TARGET_OS_IS_NETBSD)
-    static_cast<void>(pthread_setname_np(thread.native_handle(), "%s", const_cast<char*>(name.c_str())));
-+   #elif defined(BOTAN_TARGET_OS_HAS_WIN32) && defined(_LIBCPP_HAS_THREAD_API_PTHREAD)
-+   static_cast<void>(pthread_setname_np(thread.native_handle(), name.c_str()));
-    #elif defined(BOTAN_TARGET_OS_HAS_WIN32) && defined(BOTAN_BUILD_COMPILER_IS_MSVC)
-    typedef HRESULT(WINAPI * std_proc)(HANDLE, PCWSTR);
-    HMODULE kern = GetModuleHandleA("KernelBase.dll");
diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake
index 82ded2e0af..ebe6a4c1a1 100644
--- a/ports/botan/portfile.cmake
+++ b/ports/botan/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO randombit/botan
     REF "${VERSION}"
-    SHA512 5b3e22ad14bf0c37d97835c8309d1a5797cfab67b14ebfad9fd69a999ee27fe97d42ecff5e57e598d21575d053c07c30995f8c2d5f3a23433fb59d6bab45e1e7
+    SHA512 5b5766d279d92659fd8e6d5d5aac8be7328a8eae7412085c96e7059ecc560f596bf55ff0a8df6d671de5169d2a80694a6bdd6561dbe9bbb4c3df56b687c50039
     HEAD_REF master
     PATCHES
         embed-debug-info.patch
@@ -177,7 +177,7 @@ else()
     endif()
 endif()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Botan-3.3.0)
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Botan-${VERSION}")
 
 file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-3/botan" "${CURRENT_PACKAGES_DIR}/include/botan")
 
diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json
index be654727c2..034f488a26 100644
--- a/ports/botan/vcpkg.json
+++ b/ports/botan/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "botan",
-  "version": "3.3.0",
-  "port-version": 2,
+  "version": "3.5.0",
   "description": "A cryptography library written in C++11",
   "homepage": "https://botan.randombit.net",
   "license": "BSD-2-Clause",
diff --git a/versions/b-/botan.json b/versions/b-/botan.json
index b11fde3430..b3b7dcf07e 100644
--- a/versions/b-/botan.json
+++ b/versions/b-/botan.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3416aa602b64d0eff810540b4555dac28560ba3e",
+      "version": "3.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "24b20ce86f1fff75cd0c14c71e8ddcd7459b48c8",
       "version": "3.3.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index f1c276eb5f..c5c1ae8d42 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1353,8 +1353,8 @@
       "port-version": 0
     },
     "botan": {
-      "baseline": "3.3.0",
-      "port-version": 2
+      "baseline": "3.5.0",
+      "port-version": 0
     },
     "box2d": {
       "baseline": "2.4.1",