Robin Candau pushed to branch main at Arch Linux / Packaging / Packages /
kitinerary
Commits:
641c4754 by Robin Candau at 2025-01-02T19:31:50+01:00
upgpkg: 24.12.0-5: Poppler 25.01.0 rebuild
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + fix_build_with_poppler_25.01.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = kitinerary
pkgdesc = Data model and extraction system for travel reservation
information
pkgver = 24.12.0
- pkgrel = 4
+ pkgrel = 5
url = https://kontact.kde.org
arch = x86_64
license = LGPL-2.0-or-later
@@ -28,10 +28,12 @@ pkgbase = kitinerary
depends = zxing-cpp
source =
https://download.kde.org/stable/release-service/24.12.0/src/kitinerary-24.12.0.tar.xz
source =
https://download.kde.org/stable/release-service/24.12.0/src/kitinerary-24.12.0.tar.xz.sig
+ source = fix_build_with_poppler_25.01.patch
validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
validpgpkeys = F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87
validpgpkeys = D81C0CB38EB725EF6691C385BB463350D6EF31EF
sha256sums =
4c11339a5bce980bd061a4437a943200fae82e104bd8472f3b2f7dc36f82b5c7
sha256sums = SKIP
+ sha256sums =
a8561e01d397be5045c42d9dbd52eb919e2538e803e977be85df2d756b079d18
pkgname = kitinerary
=====================================
PKGBUILD
=====================================
@@ -2,7 +2,7 @@
pkgname=kitinerary
pkgver=24.12.0
-pkgrel=4
+pkgrel=5
pkgdesc='Data model and extraction system for travel reservation information'
arch=(x86_64)
url='https://kontact.kde.org'
@@ -28,13 +28,22 @@ makedepends=(doxygen
extra-cmake-modules
qt6-doc
qt6-tools)
-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}
+ fix_build_with_poppler_25.01.patch)
sha256sums=('4c11339a5bce980bd061a4437a943200fae82e104bd8472f3b2f7dc36f82b5c7'
- 'SKIP')
+ 'SKIP'
+ 'a8561e01d397be5045c42d9dbd52eb919e2538e803e977be85df2d756b079d18')
validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid
<[email protected]>
F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck
<[email protected]>
D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker
<[email protected]>
+prepare() {
+ cd $pkgname-$pkgver
+ # Temporary patch to fix build with poppler 25.01
+ # See
https://github.com/KDE/kitinerary/commit/bcb009f56f8f1c9c0d1612a0ec9f581907b51534
+ patch -Np1 -i $srcdir/fix_build_with_poppler_25.01.patch
+}
+
build() {
cmake -B build -S $pkgname-$pkgver \
-DCMAKE_INSTALL_LIBEXECDIR=lib \
=====================================
fix_build_with_poppler_25.01.patch
=====================================
@@ -0,0 +1,44 @@
+From bcb009f56f8f1c9c0d1612a0ec9f581907b51534 Mon Sep 17 00:00:00 2001
+From: Volker Krause <[email protected]>
+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
+
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/kitinerary/-/commit/641c4754523a534bbb2592ee19f0d51091f30542
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/kitinerary/-/commit/641c4754523a534bbb2592ee19f0d51091f30542
You're receiving this email because of your account on gitlab.archlinux.org.
