From 1682f6d4dd2ec6a30977a00672698b61389b07a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pa=CC=84vels=20Nadtoc=CC=8Cajevs?=
 <7645683+bruvzg@users.noreply.github.com>
Date: Wed, 10 Dec 2025 20:04:25 +0200
Subject: [PATCH] Fix build errors and warnings with LLVM-21

---
 modules/text_server_adv/text_server_adv.h            |  4 ++--
 thirdparty/README.md                                 |  1 +
 thirdparty/clipper2/include/clipper2/clipper.core.h  |  1 +
 .../clipper2/patches/0002-llvm-21-header.patch       | 12 ++++++++++++
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 thirdparty/clipper2/patches/0002-llvm-21-header.patch

diff --git a/modules/text_server_adv/text_server_adv.h b/modules/text_server_adv/text_server_adv.h
index 49a0e2512cb..57a2028c5f5 100644
--- a/modules/text_server_adv/text_server_adv.h
+++ b/modules/text_server_adv/text_server_adv.h
@@ -95,7 +95,7 @@ using namespace godot;
 // Thirdparty headers.
 
 GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wshadow")
-#ifdef __EMSCRIPTEN__
+#if defined(__EMSCRIPTEN__) || __clang_major__ >= 21
 GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunnecessary-virtual-specifier")
 #endif
 
@@ -113,7 +113,7 @@ GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunnecessary-virtual-specifier")
 #include <unicode/utypes.h>
 
 GODOT_GCC_WARNING_POP
-#ifdef __EMSCRIPTEN__
+#if defined(__EMSCRIPTEN__) || __clang_major__ >= 21
 GODOT_CLANG_WARNING_POP
 #endif
 
diff --git a/thirdparty/README.md b/thirdparty/README.md
index 527d625df61..e0a26c8bdca 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -132,6 +132,7 @@ Files extracted from upstream source:
 Patches:
 
 - `0001-disable-exceptions.patch` (GH-80796)
+- `0002-llvm-21-header.patch` (GH-113850)
 
 
 ## cvtt
diff --git a/thirdparty/clipper2/include/clipper2/clipper.core.h b/thirdparty/clipper2/include/clipper2/clipper.core.h
index 5a698e96f42..a68e87225e2 100644
--- a/thirdparty/clipper2/include/clipper2/clipper.core.h
+++ b/thirdparty/clipper2/include/clipper2/clipper.core.h
@@ -13,6 +13,7 @@
 #include "clipper2/clipper.version.h"
 #include <cstdint>
 #include <vector>
+#include <iterator>
 #include <string>
 #include <iostream>
 #include <algorithm>
diff --git a/thirdparty/clipper2/patches/0002-llvm-21-header.patch b/thirdparty/clipper2/patches/0002-llvm-21-header.patch
new file mode 100644
index 00000000000..37ec03f925e
--- /dev/null
+++ b/thirdparty/clipper2/patches/0002-llvm-21-header.patch
@@ -0,0 +1,12 @@
+diff --git a/thirdparty/clipper2/include/clipper2/clipper.core.h b/thirdparty/clipper2/include/clipper2/clipper.core.h
+index 5a698e96f4..a68e87225e 100644
+--- a/thirdparty/clipper2/include/clipper2/clipper.core.h
++++ b/thirdparty/clipper2/include/clipper2/clipper.core.h
+@@ -13,6 +13,7 @@
+ #include "clipper2/clipper.version.h"
+ #include <cstdint>
+ #include <vector>
++#include <iterator>
+ #include <string>
+ #include <iostream>
+ #include <algorithm>