diff options
Diffstat (limited to 'dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch')
| -rw-r--r-- | dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch b/dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch new file mode 100644 index 000000000000..8c4a14edc4bb --- /dev/null +++ b/dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch @@ -0,0 +1,51 @@ +Backport to fix build with USE=-deprecated + +https://github.com/godotengine/godot/commit/c197b398c38727c6cce3d2fec7aa07d2e1020e09 +From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com> +Date: Wed, 1 Feb 2023 22:29:33 +0100 +Subject: [PATCH] Fix build with `deprecated=no` not exclude + ProjectConverter3To4 options + +Fixes #72520. +--- a/main/main.cpp ++++ b/main/main.cpp +@@ -2366,8 +2366,10 @@ bool Main::start() { + String _export_preset; + bool export_debug = false; + bool export_pack_only = false; ++#ifndef DISABLE_DEPRECATED + bool converting_project = false; + bool validating_converting_project = false; ++#endif // DISABLE_DEPRECATED + #endif + + main_timer_sync.init(OS::get_singleton()->get_ticks_usec()); +@@ -2383,10 +2385,12 @@ bool Main::start() { + #ifdef TOOLS_ENABLED + } else if (args[i] == "--no-docbase") { + doc_base = false; ++#ifndef DISABLE_DEPRECATED + } else if (args[i] == "--convert-3to4") { + converting_project = true; + } else if (args[i] == "--validate-conversion-3to4") { + validating_converting_project = true; ++#endif // DISABLE_DEPRECATED + } else if (args[i] == "-e" || args[i] == "--editor") { + editor = true; + } else if (args[i] == "-p" || args[i] == "--project-manager") { +@@ -2547,6 +2551,7 @@ bool Main::start() { + return false; + } + ++#ifndef DISABLE_DEPRECATED + if (converting_project) { + int exit_code = ProjectConverter3To4(converter_max_kb_file, converter_max_line_length).convert(); + OS::get_singleton()->set_exit_code(exit_code); +@@ -2557,6 +2562,7 @@ bool Main::start() { + OS::get_singleton()->set_exit_code(exit_code); + return false; + } ++#endif // DISABLE_DEPRECATED + + #endif + |