--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ set(KPIMTEXTEDIT_LIB_VERSION "5.7.2") set(LIBKDEPIM_LIB_VERSION "5.7.2") set(LIBKLEO_LIB_VERSION "5.7.2") set(PIMCOMMON_LIB_VERSION "5.7.2") -set(GPGME_LIB_VERSION "1.8.0") +set(GPGME_LIB_VERSION "1.7.0") set(AKONADI_CONTACT_VERSION "5.7.2") if (${MIMETREEPARSER_ONLY_BUILD}) --- a/mimetreeparser/src/CMakeLists.txt +++ b/mimetreeparser/src/CMakeLists.txt @@ -159,6 +159,7 @@ target_link_libraries(KF5MimeTreeParser KF5::Codecs KF5::I18n KF5::Mime + KF5::Libkleo Qt5::Gui ) --- a/mimetreeparser/src/messagepart.cpp +++ b/mimetreeparser/src/messagepart.cpp @@ -33,7 +33,12 @@ #include -#include +#include +#if GPGME_VERSION_NUMBER < 0x010800 + #include +#else + #include +#endif #include #include #include @@ -855,7 +860,11 @@ static int signatureToStatus(const GpgME QString prettifyDN(const char *uid) { +#if GPGME_VERSION_NUMBER < 0x010800 + return Kleo::DN(uid).prettyDN(); +#else return QGpgME::DN(uid).prettyDN(); +#endif } void SignedMessagePart::sigStatusToMetaData()