From 9147f5792a47ec7442443a898feae7251a855801 Mon Sep 17 00:00:00 2001
From: Billy Robert O'Neal III <bion@microsoft.com>
Date: Thu, 30 Jan 2025 14:19:54 -0800
Subject: [PATCH] Revert angelscript patch given that it's now skipped in
 ci.baseline.txt.

---
 .../avoid-atomic-deprecation-macos-15.diff    | 21 -------------------
 ports/angelscript/portfile.cmake              |  1 -
 ports/angelscript/vcpkg.json                  |  1 -
 versions/a-/angelscript.json                  |  5 -----
 versions/baseline.json                        |  2 +-
 5 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 ports/angelscript/avoid-atomic-deprecation-macos-15.diff

diff --git a/ports/angelscript/avoid-atomic-deprecation-macos-15.diff b/ports/angelscript/avoid-atomic-deprecation-macos-15.diff
deleted file mode 100644
index 939bd46b87ccee..00000000000000
--- a/ports/angelscript/avoid-atomic-deprecation-macos-15.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/angelscript/source/as_atomic.cpp b/angelscript/source/as_atomic.cpp
-index c74cd4d..65ca563 100644
---- a/angelscript/source/as_atomic.cpp
-+++ b/angelscript/source/as_atomic.cpp
-@@ -157,6 +157,8 @@ END_AS_NAMESPACE
- #include <libkern/OSAtomic.h>
- BEGIN_AS_NAMESPACE
- 
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- int asAtomicInc(int &value)
- {
- 	return OSAtomicIncrement32((int32_t*)&value);
-@@ -166,6 +168,7 @@ int asAtomicDec(int &value)
- {
- 	return OSAtomicDecrement32((int32_t*)&value);
- }
-+#pragma clang diagnostic pop
- 
- #else
- 
diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake
index f4924aadb41cd2..437c5f90f5d327 100644
--- a/ports/angelscript/portfile.cmake
+++ b/ports/angelscript/portfile.cmake
@@ -10,7 +10,6 @@ vcpkg_extract_source_archive(
     PATCHES
         mark-threads-private.patch
         fix-dependency.patch
-        avoid-atomic-deprecation-macos-15.diff
 )
 
 vcpkg_cmake_configure(
diff --git a/ports/angelscript/vcpkg.json b/ports/angelscript/vcpkg.json
index c6941e564c088f..7b0853b40e7a9e 100644
--- a/ports/angelscript/vcpkg.json
+++ b/ports/angelscript/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "angelscript",
   "version": "2.37.0",
-  "port-version": 1,
   "description": "The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.",
   "homepage": "https://angelcode.com/angelscript",
   "license": "Zlib",
diff --git a/versions/a-/angelscript.json b/versions/a-/angelscript.json
index 718f6d5ed3383a..fdff94118c8953 100644
--- a/versions/a-/angelscript.json
+++ b/versions/a-/angelscript.json
@@ -1,10 +1,5 @@
 {
   "versions": [
-    {
-      "git-tree": "28b2de958ba7925b66eadfb38c76a3bc2ca8d450",
-      "version": "2.37.0",
-      "port-version": 1
-    },
     {
       "git-tree": "cb5cf64b9cd72cbcebfb4e68d3e82627541a39c6",
       "version": "2.37.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 023fe90a2ec595..500f8e88eb87a5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -130,7 +130,7 @@
     },
     "angelscript": {
       "baseline": "2.37.0",
-      "port-version": 1
+      "port-version": 0
     },
     "angle": {
       "baseline": "chromium_5414",