From 63ae4ecc780ba42901e6934302b75bd18d3bc5eb Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 13 Apr 2022 01:25:44 +0200 Subject: [PATCH 1/3] PdfImport: Fix compile with newer poppler Brings a dependency on poppler-qt5 to be able to include the version header, honestly it's not strictly needed, one could do a check_cxx_source_compiles, but I don't care about Calligra enough to spend more time making it compile while it's using poppler the wrong way. --- CMakeLists.txt | 1 + filters/karbon/pdf/CMakeLists.txt | 2 +- filters/karbon/pdf/PdfImport.cpp | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bdd9ed74406..d8c86810b54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -998,6 +998,7 @@ calligra_drop_product_on_bad_condition( FILTER_WPG_TO_ODG calligra_drop_product_on_bad_condition( FILTER_PDF_TO_SVG NOT_WIN "not supported on Windows" PopplerXPDFHeaders_FOUND "poppler xpdf headers not found" + Poppler_FOUND "poppler qt5 headers not found" ) calligra_drop_product_on_bad_condition( FILTER_HTML_TO_ODS diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt index 94d4071da3d..ef360f44359 100644 --- a/filters/karbon/pdf/CMakeLists.txt +++ b/filters/karbon/pdf/CMakeLists.txt @@ -19,7 +19,7 @@ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) calligra_filter_desktop_to_json(calligra_filter_pdf2svg calligra_filter_pdf2svg.desktop) -target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core) +target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core Poppler::Qt5) install(TARGETS calligra_filter_pdf2svg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters) diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp index 286f5fa78bc..c171c754116 100644 --- a/filters/karbon/pdf/PdfImport.cpp +++ b/filters/karbon/pdf/PdfImport.cpp @@ -30,6 +30,10 @@ #include +#include + +#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) + // Don't show this warning: it's an issue in poppler #ifdef __GNUC__ #pragma GCC diagnostic ignored "-Wunused-parameter" @@ -73,8 +77,13 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt if (! globalParams) return KoFilter::NotImplemented; +#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0) GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); +#else + std::unique_ptr fname = std::make_unique(QFile::encodeName(m_chain->inputFile()).data()); + PDFDoc * pdfDoc = new PDFDoc(std::move(fname)); +#endif if (! pdfDoc) { #ifdef HAVE_POPPLER_PRE_0_83 delete globalParams; -- 2.35.1