From 9514811835037ad9a86950d728cbe9b892b4f9e6 Mon Sep 17 00:00:00 2001
From: Mario Zechner <badlogicgames@gmail.com>
Date: Mon, 25 Nov 2024 16:43:25 +0100
Subject: [PATCH] [godot] Final try fixing GHA build errors on windows runners

---
 spine-godot/build/setup.sh                |   2 +-
 spine-godot/build/thorvg-4.3-stable.patch | 108 +++++++---------------
 2 files changed, 33 insertions(+), 77 deletions(-)

diff --git a/spine-godot/build/setup.sh b/spine-godot/build/setup.sh
index 0f9d3b79c..157f39cc5 100755
--- a/spine-godot/build/setup.sh
+++ b/spine-godot/build/setup.sh
@@ -65,7 +65,7 @@ cp -r ../spine-cpp/spine-cpp spine_godot
 # Apply patch for 4.3-stable, see https://github.com/godotengine/godot/issues/95861/#issuecomment-2486021565
 if [ "$branch" = "4.3-stable" ]; then
     pushd godot
-    cp ../build/thorvg-4.3-stable.patch thirdparty/thorvg/src/common/tvgLock.h
+    git apply ../build/thorvg-4.3-stable.patch
     popd
 fi
 
diff --git a/spine-godot/build/thorvg-4.3-stable.patch b/spine-godot/build/thorvg-4.3-stable.patch
index d3a4e41c5..de693b1ca 100644
--- a/spine-godot/build/thorvg-4.3-stable.patch
+++ b/spine-godot/build/thorvg-4.3-stable.patch
@@ -1,76 +1,32 @@
-/*
- * Copyright (c) 2024 the ThorVG project. All rights reserved.
-
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
-
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef _TVG_LOCK_H_
-#define _TVG_LOCK_H_
-
-#ifdef THORVG_THREAD_SUPPORT
-
-#include <mutex>
-#include "tvgTaskScheduler.h"
-
-namespace tvg {
-
-    struct Key
-    {
-        std::mutex mtx;
-    };
-
-    struct ScopedLock
-    {
-        Key* key = nullptr;
-
-        ScopedLock(Key& k)
-        {
-            if (TaskScheduler::threads() > 0) {
-                k.mtx.lock();
-                key = &k;
-            }
-        }
-
-        ~ScopedLock()
-        {
-            if (TaskScheduler::threads() > 0) {
-                key->mtx.unlock();
-            }
-        }
-    };
-
-}
-
-#else //THORVG_THREAD_SUPPORT
-
-namespace tvg {
-
-    struct Key {};
-
-    struct ScopedLock
-    {
-        ScopedLock(Key& key) {}
-    };
-
-}
-
-#endif //THORVG_THREAD_SUPPORT
-
-#endif //_TVG_LOCK_H_
-
+diff --git a/thirdparty/thorvg/src/common/tvgLock.h b/thirdparty/thorvg/src/common/tvgLock.h
+index 59f68d0..d3a4e41 100644
+--- a/thirdparty/thorvg/src/common/tvgLock.h
++++ b/thirdparty/thorvg/src/common/tvgLock.h
+@@ -25,8 +25,6 @@
+ 
+ #ifdef THORVG_THREAD_SUPPORT
+ 
+-#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
+-
+ #include <mutex>
+ #include "tvgTaskScheduler.h"
+ 
+diff --git a/thirdparty/thorvg/src/renderer/tvgTaskScheduler.h b/thirdparty/thorvg/src/renderer/tvgTaskScheduler.h
+index 93f8481..b1fb461 100644
+--- a/thirdparty/thorvg/src/renderer/tvgTaskScheduler.h
++++ b/thirdparty/thorvg/src/renderer/tvgTaskScheduler.h
+@@ -23,8 +23,6 @@
+ #ifndef _TVG_TASK_SCHEDULER_H_
+ #define _TVG_TASK_SCHEDULER_H_
+ 
+-#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
+-
+ #include <mutex>
+ #include <condition_variable>
+ 
+@@ -111,4 +109,4 @@ struct TaskScheduler
+ }  //namespace
+ 
+ #endif //_TVG_TASK_SCHEDULER_H_
+- 
++