diff -Naru kitinerary-18.08.3.orig/CMakeLists.txt kitinerary-18.08.3/CMakeLists.txt --- kitinerary-18.08.3.orig/CMakeLists.txt 2019-02-22 19:07:41.890816034 +0100 +++ kitinerary-18.08.3/CMakeLists.txt 2019-02-22 19:08:59.997811714 +0100 @@ -42,6 +42,9 @@ if (${Poppler_VERSION} VERSION_GREATER 0.57) set(HAVE_POPPLER_0_58 ON) endif() + if (${Poppler_VERSION} VERSION_GREATER 0.71) + set(HAVE_POPPLER_0_72 ON) + endif() endif() if (TARGET zxing::libzxing) set(HAVE_ZXING ON) @@ -81,3 +84,14 @@ ) install(FILES org_kde_kitinerary.categories DESTINATION ${KDE_INSTALL_CONFDIR}) ki18n_install(po) + +MESSAGE(STATUS "<<< Gentoo configuration >>> +Build type ${CMAKE_BUILD_TYPE} +Install path ${CMAKE_INSTALL_PREFIX} +Compiler flags: +C ${CMAKE_C_FLAGS} +C++ ${CMAKE_CXX_FLAGS} +Linker flags: +Executable ${CMAKE_EXE_LINKER_FLAGS} +Module ${CMAKE_MODULE_LINKER_FLAGS} +Shared ${CMAKE_SHARED_LINKER_FLAGS}\n") diff -Naru kitinerary-18.08.3.orig/src/config-kitinerary.h.cmake kitinerary-18.08.3/src/config-kitinerary.h.cmake --- kitinerary-18.08.3.orig/src/config-kitinerary.h.cmake 2019-02-22 19:07:41.897816034 +0100 +++ kitinerary-18.08.3/src/config-kitinerary.h.cmake 2019-02-22 19:08:08.908814540 +0100 @@ -22,6 +22,7 @@ #cmakedefine HAVE_POPPLER #cmakedefine HAVE_POPPLER_0_58 +#cmakedefine HAVE_POPPLER_0_72 #cmakedefine HAVE_ZXING #cmakedefine HAVE_KCAL #cmakedefine HAVE_KCONTACTS diff -Naru kitinerary-18.08.3.orig/src/pdfdocument.cpp kitinerary-18.08.3/src/pdfdocument.cpp --- kitinerary-18.08.3.orig/src/pdfdocument.cpp 2019-02-22 19:07:41.896816034 +0100 +++ kitinerary-18.08.3/src/pdfdocument.cpp 2019-02-22 19:08:08.908814540 +0100 @@ -306,7 +306,12 @@ const auto pageRect = d->m_doc->m_popplerDoc->getPage(d->m_pageNum + 1)->getCropBox(); std::unique_ptr s(device->getText(ratio(pageRect->x1, pageRect->x2, left), ratio(pageRect->y1, pageRect->y2, top), ratio(pageRect->x1, pageRect->x2, right), ratio(pageRect->y1, pageRect->y2, bottom))); - return QString::fromUtf8(s->getCString()); +#ifdef HAVE_POPPLER_0_72 + return QString::fromUtf8(s->c_str()); +#else + return QString::fromUtf8(s->getCString()); +#endif + #else Q_UNUSED(left); Q_UNUSED(top); @@ -440,7 +445,11 @@ PdfPage page; page.d->m_pageNum = i; page.d->m_doc = doc->d.get(); +#ifdef HAVE_POPPLER_0_72 + page.d->m_text = QString::fromUtf8(s->c_str()); +#else page.d->m_text = QString::fromUtf8(s->getCString()); +#endif page.d->m_images = std::move(device->m_images); for (auto it = page.d->m_images.begin(); it != page.d->m_images.end(); ++it) { (*it).d->m_page = page.d.data();