From 18f792543e0bccca516d7ed12a818500270b0e9f Mon Sep 17 00:00:00 2001
From: Mario Zechner <badlogicgames@gmail.com>
Date: Wed, 19 Nov 2025 13:43:08 +0100
Subject: [PATCH] [godot] Fix attempt for iOS patch

---
 spine-godot/build/setup.sh                 | 21 ++++++++++++++++-----
 spine-libgdx/spine-libgdx-tests/.project   | 11 +++++++++++
 spine-libgdx/spine-libgdx/.project         | 11 +++++++++++
 spine-libgdx/spine-skeletonviewer/.project | 11 +++++++++++
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/spine-godot/build/setup.sh b/spine-godot/build/setup.sh
index c56e9cef1..85fbc9467 100755
--- a/spine-godot/build/setup.sh
+++ b/spine-godot/build/setup.sh
@@ -71,12 +71,23 @@ if [ "$branch" = "4.3-stable" ]; then
 fi
 
 # Apply iOS Vulkan fix for C++ module imports in extern "C" blocks
-# This fixes compilation errors with newer Xcode versions
-pushd godot
-if [ -f ../build/ios-vulkan-fix.patch ]; then
-    git apply ../build/ios-vulkan-fix.patch
+# This fixes compilation errors with newer Xcode versions on Godot 4.x
+if [[ "$branch" == 4* ]]; then
+    pushd godot
+    if [ -f platform/ios/detect.py ]; then
+        # Check if the fix is already applied
+        if ! grep -q "Wno-error=module-import-in-extern-c" platform/ios/detect.py; then
+            # Insert the fix after the -Wno-ambiguous-macro line
+            sed -i.bak '/Wno-ambiguous-macro/a\
+\
+    # Fix for C++ module imports in extern "C" blocks in Vulkan headers\
+    env.Append(CCFLAGS=["-Wno-error=module-import-in-extern-c"])
+' platform/ios/detect.py && rm platform/ios/detect.py.bak
+            echo "Applied iOS Vulkan fix to platform/ios/detect.py"
+        fi
+    fi
+    popd
 fi
-popd
 
 popd
 
diff --git a/spine-libgdx/spine-libgdx-tests/.project b/spine-libgdx/spine-libgdx-tests/.project
index 263966f61..bdbef16f3 100644
--- a/spine-libgdx/spine-libgdx-tests/.project
+++ b/spine-libgdx/spine-libgdx-tests/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1763543634399</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/spine-libgdx/spine-libgdx/.project b/spine-libgdx/spine-libgdx/.project
index 7d65046eb..1a50fee1d 100644
--- a/spine-libgdx/spine-libgdx/.project
+++ b/spine-libgdx/spine-libgdx/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1763543634394</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/spine-libgdx/spine-skeletonviewer/.project b/spine-libgdx/spine-skeletonviewer/.project
index 7d23d2a34..6ef79b272 100644
--- a/spine-libgdx/spine-skeletonviewer/.project
+++ b/spine-libgdx/spine-skeletonviewer/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1763543634400</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>