Errors with Custom Iterator Patch

2 errors occur with latest godot/master commit as of writing (7cdad333114e6765351ed0facb48db228ef29b7b). It looks like the following commits breaks the patch:

0ee7e3102b6072d2f5a9d157c8afdb99e13624e6 and 9e0b38ecd30cfe30c9e31e50f680da0e89d60ec6 breaks the patch for main.cpp.

    // process all our active interfaces
+#ifndef _3D_DISABLED
    XRServer::get_singleton()->_process();
+#endif // _3D_DISABLED

+   NavigationServer2D::get_singleton()->sync();
+   NavigationServer3D::get_singleton()->sync();

The patch (Lines 40 to 53) only looks for:

    // process all our active interfaces
    XRServer::get_singleton()->_process();

    for (int iters = 0; iters < advance.physics_steps; ++iters) {
        if (Input::get_singleton()->is_using_input_buffering() && agile_input_event_flushing) {
            Input::get_singleton()->flush_buffered_events();

resulting in a reject.

Likewise, 023dcd44c1e628bb654b5472418d6a346b510a71 breaks the patch for main.h.

-   static bool start();
+   static int start();

The patch (Lines 77 to 85) can't find

 #endif
    static bool start();

which also results in a reject.

My OS is macOS 12.2.1, M1 chip (architecture is arm64).

GodotECS / godex

Errors with Custom Iterator Patch #311