Finally^2 (If we continue with this speed, we might have it merged around the time we are retired ;-)
I resolved the merge conflicts by merging master into this branch. It might not be clear what exactly I did, so:
1. The lcpp problem
https://github.com/geany/geany/commit/6f692112e39fa0714d882332b8f935419fd69a...
seemed to be fixed upstream so I kept the version from this pull request and discarded your patch.
2. I kept the fix from
https://github.com/geany/geany/commit/63850b3eb7302b6ce1c4223581be7687dc231a...
in parse.c - I didn't find this function in current ctags master so this code will probably be removed in the future ctags sync.
3. I added the unsigned from
https://github.com/geany/geany/commit/dbd0573dd6a5175ec9b536c4053bb66caac0f6...
to the corresponding function where this code is now.