I've imported both code drops, so now one can do a "git log -p" to see the
changes. It seems that the more recent code also improves the non-note support
(unit testing, more error checks).

See https://cgit.freedesktop.org/SyncEvolution/syncevolution/log/?h=tde

But now TDE >= 14.1 is required. If you want to support both, then you'll have
to add a configure version check and ifdefs to the code.

Please let me know how you want to proceed - it's your call, I don't know
enough about TDE to decide.