following https://phabricator.kde.org/D25595
arc diff + update CMakeLists.Txt for new akonadi version.