Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kitinerary for openSUSE:Factory checked in at 2025-01-06 16:04:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitinerary (Old) and /work/SRC/openSUSE:Factory/.kitinerary.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kitinerary" Mon Jan 6 16:04:29 2025 rev:80 rq:1234794 version:24.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kitinerary/kitinerary.changes 2024-12-13 22:27:06.105955919 +0100 +++ /work/SRC/openSUSE:Factory/.kitinerary.new.1881/kitinerary.changes 2025-01-06 16:04:33.184116824 +0100 @@ -1,0 +2,6 @@ +Fri Jan 3 21:10:11 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com> + +- Add bcb009f56f8f1c9c0d1612a0ec9f581907b51534.patch -- Fix + compilation against Poppler 25.01. + +------------------------------------------------------------------- New: ---- bcb009f56f8f1c9c0d1612a0ec9f581907b51534.patch BETA DEBUG BEGIN: New: - Add bcb009f56f8f1c9c0d1612a0ec9f581907b51534.patch -- Fix compilation against Poppler 25.01. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitinerary.spec ++++++ --- /var/tmp/diff_new_pack.i3WL8R/_old 2025-01-06 16:04:33.844144068 +0100 +++ /var/tmp/diff_new_pack.i3WL8R/_new 2025-01-06 16:04:33.844144068 +0100 @@ -1,7 +1,7 @@ # # spec file for package kitinerary # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,8 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif +# PATCH-FIX-UPSTREAM bcb009f56f8f1c9c0d1612a0ec9f581907b51534.patch -- Fix compilation against Poppler 25.01 +Patch0: https://github.com/KDE/kitinerary/commit/bcb009f56f8f1c9c0d1612a0ec9f581907b... BuildRequires: doxygen BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: libphonenumber-devel ++++++ bcb009f56f8f1c9c0d1612a0ec9f581907b51534.patch ++++++ From bcb009f56f8f1c9c0d1612a0ec9f581907b51534 Mon Sep 17 00:00:00 2001 From: Volker Krause <vkrause@kde.org> Date: Sat, 21 Dec 2024 16:44:37 +0100 Subject: [PATCH] Fix compilation against Poppler 25.01 --- src/lib/pdf/pdfdocument.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/lib/pdf/pdfdocument.cpp b/src/lib/pdf/pdfdocument.cpp index f829e645..1eb0d61e 100644 --- a/src/lib/pdf/pdfdocument.cpp +++ b/src/lib/pdf/pdfdocument.cpp @@ -40,9 +40,14 @@ void PdfPagePrivate::load() m_doc->m_popplerDoc->processLinks(&device, m_pageNum + 1); device.finalize(); const auto pageRect = m_doc->m_popplerDoc->getPage(m_pageNum + 1)->getCropBox(); +#if KPOPPLER_VERSION < QT_VERSION_CHECK(25, 1, 0) std::unique_ptr<GooString> s(device.getText(pageRect->x1, pageRect->y1, pageRect->x2, pageRect->y2)); - m_text = QString::fromUtf8(s->c_str()); +#else + const auto s = device.getText(pageRect->x1, pageRect->y1, pageRect->x2, pageRect->y2); + m_text = QString::fromUtf8(s.c_str()); +#endif + m_images = std::move(device.m_images); for (auto it = m_images.begin(); it != m_images.end(); ++it) { (*it).d->m_page = this; @@ -107,8 +112,13 @@ QString PdfPage::textInRect(double left, double top, double right, double bottom TextOutputDev device(nullptr, false, 0, false, false); d->m_doc->m_popplerDoc->displayPageSlice(&device, d->m_pageNum + 1, 72, 72, 0, false, true, false, -1, -1, -1, -1); +#if KPOPPLER_VERSION <QT_VERSION_CHECK(25, 1, 0) std::unique_ptr<GooString> s(device.getText(l, t, r, b)); return QString::fromUtf8(s->c_str()); +#else + const auto s = device.getText(l, t, r, b); + return QString::fromUtf8(s.c_str()); +#endif } int PdfPage::imageCount() const