8 files changed, 72 insertions, 31 deletions
diff --git a/community/godot/build b/community/godot/build
index aba972ea..804ba9e9 100755
--- a/community/godot/build
+++ b/community/godot/build
@@ -1,4 +1,5 @@
 #!/bin/sh -e
+# TODO
 
 # Temporarily install scons to build godot
 (
@@ -11,29 +12,34 @@
 
 )
 
+for patch in *.patch; do
+    [ -f "$patch" ] && patch -p1 < "$patch"
+done
+
 PYTHONPATH=$(./pythonpath)
 PATH=$PWD/scons/dist/usr/bin:$PATH
 
 export PYTHONPATH PATH
 
-clsed 's/#ifdef CRASH_HANDLER_ENABLED/#if defined(CRASH_HANDLER_ENABLED) \&\& defined(__GLIBC__)/' \
-      platform/x11/crash_handler_x11.cpp
-
 scons \
-    platform=x11 \
-    target=release_debug \
-    tools=yes \
-    dev=no \
-    progress=yes \
+    progress=true \
     arch=x64 \
-    builtin_libwebp=false \
-    builtin_zlib=false \
+    speechd=no \
+    graphite=false \
     builtin_freetype=false \
-    builtin_libvorbis=false \
+    builtin_zlib=false \
+    builtin_glslang=true \
+    builtin_graphite=false \
+    builtin_harfbuzz=false \
+    builtin_icu4c=false \
+    builtin_libpng=false \
     builtin_libogg=false \
-    builtin_opus=false \
-    builtin_libtheora=false
+    builtin_libtheora=false \
+    builtin_libvorbis=false \
+    builtin_libwebp=false \
+    builtin_zstd=false
 
-clinst -Dm755 bin/godot.x11.opt.tools.x64 "$1/usr/bin/godot"
-clinst -Dm644 icon.png                    "$1/usr/share/pixmaps/godot.png"
-clinst -Dm644 godot.desktop               "$1/usr/share/applications/godot.desktop"
+clinst -Dm755 bin/godot.linuxbsd.editor.x86_64 "$1/usr/bin/godot4"
+clinst -Dm644 icon.png                         "$1/usr/share/pixmaps/godot.png"
+clinst -Dm644 godot4.desktop                   "$1/usr/share/applications/godot4.desktop"
+ln -s godot4 "$1/usr/bin/godot"
diff --git a/community/godot/checksums b/community/godot/checksums
index 10a9e01f..966dc76f 100644
--- a/community/godot/checksums
+++ b/community/godot/checksums
@@ -1,5 +1,7 @@
 %BLAKE3
-a6c4e7cc5cc583a716e11ee80fee362a22ef310a699a631626ee876a84328131  3.5.1-stable.tar.gz
+8eef83b419d6ad65f0b665646e0644222155b8edda9d57b65a87369a0017aaf8  4.1.1-stable.tar.gz
 2b2207d86f6b687d9af604fd86dc47d3cfd07044f1474da9d63180a1dad53687  SCons-4.4.0.tar.gz
 312b85c0aaffc44755ad268c8ce8c83f46e33e4632b9d4b9d6ac06b5cb071dbb  pythonpath
-32830ef2a81551e19c17897c82b3ed6ce9933cdc41afca2f1848575d6bc52bb0  godot.desktop
+3a15ce56e6e77e491eef51eeacb2ed725c50b94709cd8647319f94f5af6adba3  godot4.desktop
+58cc4335281c866a473f400adb199e39a4e5ab430169ee21bf2416227d18f3b7  gcc13.patch
+5e16897296376160ebab5022c920b7252472e02fb7ad8421064aa2e259a17a61  no-execinfo.patch
diff --git a/community/godot/depends b/community/godot/depends
index e0e821fc..f9dc07d8 100644
--- a/community/godot/depends
+++ b/community/godot/depends
@@ -1,18 +1,12 @@
 freetype-harfbuzz
-libX11
-libXcursor
-libXext
-libXi
-libXinerama
-libXrandr
-libXrender
 libogg
+libpng
 libtheora
 libvorbis
 libwebp
-libxcb
 mesa
 opus
 opusfile
 python make
 zlib
+zstd
diff --git a/community/godot/files/godot.desktop b/community/godot/files/godot4.desktop
index e63874e9..7bb357e8 100644
--- a/community/godot/files/godot.desktop
+++ b/community/godot/files/godot4.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=Godot
+Name=Godot4
 Comment=Application for making games
-Exec=/usr/bin/godot %U
+Exec=/usr/bin/godot4 %U
 Icon=godot
 Terminal=false
 Type=Application
diff --git a/community/godot/patches/gcc13.patch b/community/godot/patches/gcc13.patch
new file mode 100644
index 00000000..0db5a116
--- /dev/null
+++ b/community/godot/patches/gcc13.patch
@@ -0,0 +1,10 @@
+--- a/thirdparty/vhacd/inc/vhacdManifoldMesh.h
++++ b/thirdparty/vhacd/inc/vhacdManifoldMesh.h
+@@ -15,6 +15,7 @@
+ #pragma once
+ #ifndef VHACD_MANIFOLD_MESH_H
+ #define VHACD_MANIFOLD_MESH_H
++#include <cstdint>
+ #include "vhacdCircularList.h"
+ #include "vhacdSArray.h"
+ #include "vhacdVector.h"
diff --git a/community/godot/patches/no-execinfo.patch b/community/godot/patches/no-execinfo.patch
new file mode 100644
index 00000000..202bc9c0
--- /dev/null
+++ b/community/godot/patches/no-execinfo.patch
@@ -0,0 +1,27 @@
+diff --git a/platform/linuxbsd/crash_handler_linuxbsd.cpp b/platform/linuxbsd/crash_handler_linuxbsd.cpp
+index 3a24546..ae7430f 100644
+--- a/platform/linuxbsd/crash_handler_linuxbsd.cpp
++++ b/platform/linuxbsd/crash_handler_linuxbsd.cpp
+@@ -37,7 +37,6 @@
+ #include "main/main.h"
+ 
+ #ifdef DEBUG_ENABLED
+-#define CRASH_HANDLER_ENABLED 1
+ #endif
+ 
+ #ifdef CRASH_HANDLER_ENABLED
+diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
+index 3f713d2..e27e1eb 100644
+--- a/platform/linuxbsd/detect.py
++++ b/platform/linuxbsd/detect.py
+@@ -429,8 +429,8 @@ def configure(env: "Environment"):
+     if not env["execinfo"] and platform.libc_ver()[0] != "glibc":
+         # The default crash handler depends on glibc, so if the host uses
+         # a different libc (BSD libc, musl), fall back to libexecinfo.
+-        print("Note: Using `execinfo=yes` for the crash handler as required on platforms where glibc is missing.")
+-        env["execinfo"] = True
++        # print("Note: Using `execinfo=yes` for the crash handler as required on platforms where glibc is missing.")
++        env["execinfo"] = False
+ 
+     if env["execinfo"]:
+         env.Append(LIBS=["execinfo"])
diff --git a/community/godot/sources b/community/godot/sources
index 6e7fc231..4997676d 100644
--- a/community/godot/sources
+++ b/community/godot/sources
@@ -1,4 +1,6 @@
-https://github.com/godotengine/godot/archive/3.5.1-stable.tar.gz
+https://github.com/godotengine/godot/archive/4.1.1-stable.tar.gz
 https://github.com/SCons/scons/releases/download/4.4.0/SCons-4.4.0.tar.gz scons
 files/pythonpath
-files/godot.desktop
+files/godot4.desktop
+patches/gcc13.patch
+patches/no-execinfo.patch
diff --git a/community/godot/version b/community/godot/version
index 591d5e43..7b6aadfa 100644
--- a/community/godot/version
+++ b/community/godot/version
@@ -1 +1 @@
-3.5.1 1
+4.1.1 1