66 lines
2.8 KiB
Diff
66 lines
2.8 KiB
Diff
|
From 236bacbe13739414e919de868283b0caf2df5d8a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Albert Astals Cid <aacid@kde.org>
|
||
|
|
Date: Wed, 13 Apr 2022 01:25:44 +0200
|
||
|
|
Subject: 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.
|
||
|
|
|
||
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 51f1d65b8e6..06bbad5c24c 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -952,6 +952,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 8fddf1ad757..b71c92cbf04 100644
|
||
|
|
--- a/filters/karbon/pdf/CMakeLists.txt
|
||
|
|
+++ b/filters/karbon/pdf/CMakeLists.txt
|
||
|
|
@@ -3,7 +3,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 abbe681b4e8..e97974fc133 100644
|
||
|
|
--- a/filters/karbon/pdf/PdfImport.cpp
|
||
|
|
+++ b/filters/karbon/pdf/PdfImport.cpp
|
||
|
|
@@ -17,6 +17,10 @@
|
||
|
|
|
||
|
|
#include <kpluginfactory.h>
|
||
|
|
|
||
|
|
+#include <poppler-version.h>
|
||
|
|
+
|
||
|
|
+#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"
|
||
|
|
@@ -54,8 +58,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<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data());
|
||
|
|
+ PDFDoc * pdfDoc = new PDFDoc(std::move(fname));
|
||
|
|
+#endif
|
||
|
|
if (! pdfDoc) {
|
||
|
|
#ifdef HAVE_POPPLER_PRE_0_83
|
||
|
|
delete globalParams;
|