Fix compiling SDL without DBus under Linux#111146
Conversation
bruvzg
left a comment
There was a problem hiding this comment.
Is it building and joystick input working without these files? If it is, we should remove them completely. System theme code should not be used at all, and FCITX (same for ibus) is for IME, and we only use SDL for joystick, not text input.
a11159f to
64fd116
Compare
|
Can patch files be changed after they've been created? If we remove these files, I think we should also remove the related changes from the patch files, see: SDL update script should also probably be changed: https://github.com/godotengine/godot/blob/master/thirdparty/sdl/update-sdl.sh#L50 |
|
@bruvzg I can build and joystick works without either of these files, so I've just removed them. I also removed two other files related to IME which don't appear to do anything. I do get a bug when compiling with to be printed to the console, but my assumption is that this doesn't have anything to do with this pr. |
Yes, the way I typically do it is to reverse the patch (e.g. with |
64fd116 to
30923ca
Compare
|
@Nintorch I removed the files from the patch which are no longer being compiled. I'm not sure what to change about the update script, should I just |
|
Yeah you should diff --git a/thirdparty/sdl/update-sdl.sh b/thirdparty/sdl/update-sdl.sh
index 11a9d37f48..7aa8c2b915 100755
--- a/thirdparty/sdl/update-sdl.sh
+++ b/thirdparty/sdl/update-sdl.sh
@@ -49,6 +49,7 @@ cp -v io/SDL_iostream*.{c,h} $target/io
mkdir $target/core
cp -rv core/{linux,unix,windows} $target/core
rm -f $target/core/windows/version.rc
+rm -f $target/core/linux/SDL_{fcitx,ibus,ime,system_theme}.*
mkdir $target/haptic
cp -rv haptic/{*.{c,h},darwin,linux,windows} $target/haptic |
30923ca to
03eb426
Compare
|
Thanks! |
|
Cherry-picked for 4.5.1. |
Co-authored-by: Kaleb Reid <78945904+Kaleb-Reid@users.noreply.github.com>
Co-authored-by: Kaleb Reid <78945904+Kaleb-Reid@users.noreply.github.com>
Some files being compiled in the sdl driver which require DBus support do not seem to actually be used.
Fixes #111049