- Made the patch of the cmake files a bit more clean
- Fix build requirement on AkondiContacts
- Add a patch fixakonadi.patch to adopt to latest KDE akonadi.