Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package calligra for openSUSE:Factory checked in at 2022-03-10 22:46:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra (Old) and /work/SRC/openSUSE:Factory/.calligra.new.2349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra" Thu Mar 10 22:46:06 2022 rev:82 rq:960910 version:3.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/calligra/calligra.changes 2022-01-20 00:13:20.130627654 +0100 +++ /work/SRC/openSUSE:Factory/.calligra.new.2349/calligra.changes 2022-03-11 11:40:49.554577991 +0100 @@ -1,0 +2,5 @@ +Thu Mar 10 17:07:10 UTC 2022 - Wolfgang Bauer <wba...@tmo.at> + +- Add poppler-22.03.0.patch to fix build with poppler-22.03.0 + +------------------------------------------------------------------- New: ---- poppler-22.03.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.UWi9IY/_old 2022-03-11 11:40:50.190578704 +0100 +++ /var/tmp/diff_new_pack.UWi9IY/_new 2022-03-11 11:40:50.194578709 +0100 @@ -28,12 +28,14 @@ Group: Productivity/Office/Suite URL: https://www.calligra.org/ Source0: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE +# PATCH-FIX-UPSTREAM Patch0: Set-CXX_STANDARD-to-17.patch # PATCH-FIX-UPSTREAM Patch1: Fix-Freetype-and-FontConfig-Linkage.patch # PATCH-FIX-UPSTREAM Patch2: Fix-some-more-warnings.patch +# PATCH-FIX-UPSTREAM +Patch3: poppler-22.03.0.patch BuildRequires: OpenEXR-devel BuildRequires: extra-cmake-modules BuildRequires: fdupes ++++++ poppler-22.03.0.patch ++++++ Subject: Fix build with poppler-22.03.0 From: Wolfgang Bauer <wba...@tmo.at> Adjusts the PDF importer plugin to (private) API changes in poppler 22.03.0. Patch taken from Arch Linux. diff -uprw calligra-3.2.1.orig/filters/karbon/pdf/CMakeLists.txt calligra-3.2.1/filters/karbon/pdf/CMakeLists.txt --- calligra-3.2.1.orig/filters/karbon/pdf/CMakeLists.txt 2020-05-14 09:51:30.000000000 +0300 +++ calligra-3.2.1/filters/karbon/pdf/CMakeLists.txt 2022-03-02 12:19:08.039939530 +0200 @@ -14,6 +14,10 @@ if(Poppler_VERSION VERSION_LESS "0.83.0" add_definitions("-DHAVE_POPPLER_PRE_0_83") endif() +if(Poppler_VERSION VERSION_LESS "22.3.0") + add_definitions("-DHAVE_POPPLER_PRE_22_3") +endif() + set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) diff -uprw calligra-3.2.1.orig/filters/karbon/pdf/Pdf2OdgImport.cpp calligra-3.2.1/filters/karbon/pdf/Pdf2OdgImport.cpp --- calligra-3.2.1.orig/filters/karbon/pdf/Pdf2OdgImport.cpp 2020-05-14 09:51:30.000000000 +0300 +++ calligra-3.2.1/filters/karbon/pdf/Pdf2OdgImport.cpp 2022-03-02 12:20:35.125605950 +0200 @@ -86,8 +86,12 @@ KoFilter::ConversionStatus Pdf2OdgImport if (! globalParams) return KoFilter::NotImplemented; +#ifdef HAVE_POPPLER_PRE_22_3 GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); +#else + PDFDoc * pdfDoc = new PDFDoc(std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data())); +#endif if (! pdfDoc) { #ifdef HAVE_POPPLER_PRE_0_83 delete globalParams; diff -uprw calligra-3.2.1.orig/filters/karbon/pdf/PdfImport.cpp calligra-3.2.1/filters/karbon/pdf/PdfImport.cpp --- calligra-3.2.1.orig/filters/karbon/pdf/PdfImport.cpp 2020-05-14 09:51:30.000000000 +0300 +++ calligra-3.2.1/filters/karbon/pdf/PdfImport.cpp 2022-03-02 12:21:46.197510028 +0200 @@ -73,8 +73,12 @@ KoFilter::ConversionStatus PdfImport::co if (! globalParams) return KoFilter::NotImplemented; +#ifdef HAVE_POPPLER_PRE_22_3 GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); +#else + PDFDoc * pdfDoc = new PDFDoc(std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data())); +#endif if (! pdfDoc) { #ifdef HAVE_POPPLER_PRE_0_83 delete globalParams;
