I've updated the patch to use the latest ctags which already contains most of the functionality we need. There are still 2 things needed upstream:
https://github.com/universal-ctags/ctags/pull/2100 https://github.com/universal-ctags/ctags/pull/2087
After this the only change of the main directory against uctags will be the patch which changes how anon tags are named (instead of Anon<hash> we use Anon<number>). I'll then prepare a patch file which we'll just need to apply every time we copy ctags main directory to Geany.