Date: Wednesday, March 2, 2022 @ 09:05:32 Author: foutrelis Revision: 438278
Fix build with poppler 22.03.0 Added: kitinerary/trunk/poppler-22.03.0.patch Modified: kitinerary/trunk/PKGBUILD -----------------------+ PKGBUILD | 11 +++++++++-- poppler-22.03.0.patch | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-03-02 08:32:37 UTC (rev 438277) +++ PKGBUILD 2022-03-02 09:05:32 UTC (rev 438278) @@ -9,14 +9,21 @@ license=(LGPL) depends=(kmime kpkpass kcalendarcore kcontacts poppler libphonenumber zxing-cpp) makedepends=(extra-cmake-modules qt5-tools doxygen) -source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}) +source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig} + poppler-22.03.0.patch) sha256sums=('e26a20538c5fbc85bd8eb93c3ad8e7150ac953cba2f56e20293b438b0031ff3c' - 'SKIP') + 'SKIP' + 'e5325fc0eba9c971afa7be1fd209aae8a69ee3704b80fe74355c719dac56885d') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <[email protected]> F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <[email protected]> D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <[email protected]> options=(debug) +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../poppler-22.03.0.patch +} + build() { cmake -B build -S $pkgname-$pkgver \ -DCMAKE_INSTALL_LIBEXECDIR=lib \ Added: poppler-22.03.0.patch =================================================================== --- poppler-22.03.0.patch (rev 0) +++ poppler-22.03.0.patch 2022-03-02 09:05:32 UTC (rev 438278) @@ -0,0 +1,15 @@ +diff -upr kitinerary-21.12.2.orig/src/lib/pdf/pdfdocument.cpp kitinerary-21.12.2/src/lib/pdf/pdfdocument.cpp +--- kitinerary-21.12.2.orig/src/lib/pdf/pdfdocument.cpp 2022-01-29 01:31:44.000000000 +0200 ++++ kitinerary-21.12.2/src/lib/pdf/pdfdocument.cpp 2022-03-02 11:01:34.112359075 +0200 +@@ -301,7 +301,11 @@ PdfDocument* PdfDocument::fromData(const + obj.initNull(); + auto stream = new MemStream(const_cast<char*>(doc->d->m_pdfData.constData()), 0, doc->d->m_pdfData.size(), &obj); + #endif ++#if KPOPPLER_VERSION >= QT_VERSION_CHECK(22, 3, 0) ++ std::unique_ptr<PDFDoc> popplerDoc(new PDFDoc(stream)); ++#else + std::unique_ptr<PDFDoc> popplerDoc(new PDFDoc(stream, nullptr, nullptr)); ++#endif + if (!popplerDoc->isOk()) { + qCWarning(Log) << "Got invalid PDF document!" << popplerDoc->getErrorCode(); + return nullptr;
