From 110e4eff2d8ee47782b9e544f438b195e93d2082 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Tue, 31 May 2022 17:59:56 +0700
Subject: [PATCH] Update godot-cpp

Updates the godot-cpp submodule to a version which supports universal macOS
builds.

- We now need to include the standard string in terminal.cpp.
- Clean-up .gitmodules while we're at it.
---
 .gitmodules                                   | 27 +++++++------------
 addons/godot_xterm/native/src/terminal.cpp    |  1 +
 .../godot_xterm/native/thirdparty/godot-cpp   |  2 +-
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 92f1cdd..0942606 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,24 +1,15 @@
-[submodule "addons/godot_xterm/godot-cpp"]
+[submodule "docs/wiki"]
+	path = docs/wiki
+	url = https://github.com/lihop/godot-xterm.wiki
+[submodule "addons/godot_xterm/native/thirdparty/godot-cpp"]
 	path = addons/godot_xterm/native/thirdparty/godot-cpp
-	url = https://github.com/lihop/godot-cpp
-[submodule "addons/godot_xterm/libtsm"]
+	url = https://github.com/godotengine/godot-cpp
+[submodule "addons/godot_xterm/native/thirdparty/libuv"]
+	path = addons/godot_xterm/native/thirdparty/libuv
+	url = https://github.com/libuv/libuv
+[submodule "addons/godot_xterm/native/thirdparty/libtsm"]
 	path = addons/godot_xterm/native/thirdparty/libtsm
 	url = https://github.com/lihop/libtsm
 [submodule "misc/export_templates/godot"]
 	path = misc/export_templates/godot
 	url = https://github.com/godotengine/godot
-[submodule "addons/godot_xterm/native/thirdparty/libuv"]
-	path = addons/godot_xterm/native/thirdparty/libuv
-	url = https://github.com/libuv/libuv
-[submodule "libuv/"]
-	url = https://github.com/lihop/libuv
-[submodule "libuv"]
-	url = https://github.com/libuv/libuv
-[submodule "godot-cpp/"]
-	url = https://github.com/godotengine/godot-cpp
-[submodule "docs/godot-xterm.wiki"]
-	path = docs/godot-xterm.wiki
-	url = https://github.com/lihop/godot-xterm.wiki
-[submodule "docs/wiki"]
-	path = docs/wiki
-	url = https://github.com/lihop/godot-xterm.wiki
diff --git a/addons/godot_xterm/native/src/terminal.cpp b/addons/godot_xterm/native/src/terminal.cpp
index 700ecfc..6ad8fa7 100644
--- a/addons/godot_xterm/native/src/terminal.cpp
+++ b/addons/godot_xterm/native/src/terminal.cpp
@@ -8,6 +8,7 @@
 #include <ResourceLoader.hpp>
 #include <Theme.hpp>
 #include <algorithm>
+#include <string>
 #include <xkbcommon/xkbcommon-keysyms.h>
 
 // For _populate_key_list(), see below.
diff --git a/addons/godot_xterm/native/thirdparty/godot-cpp b/addons/godot_xterm/native/thirdparty/godot-cpp
index 26d4df4..f9f6767 160000
--- a/addons/godot_xterm/native/thirdparty/godot-cpp
+++ b/addons/godot_xterm/native/thirdparty/godot-cpp
@@ -1 +1 @@
-Subproject commit 26d4df4e174124e1174c624d770661b1394fcf5f
+Subproject commit f9f6767722e17a1d690f7ce975e1e7f8065b61e2