kitinerary: update to 26.04.1.
This commit is contained in:
@@ -1,62 +0,0 @@
|
||||
From 72f2de553f31efd2761eec6283c6d87a1c7a4598 Mon Sep 17 00:00:00 2001
|
||||
From: Volker Krause <vkrause@kde.org>
|
||||
Date: Mon, 30 Mar 2026 21:19:10 +0200
|
||||
Subject: [PATCH] Adapt to Poppler 26.04 API changes
|
||||
|
||||
(cherry picked from commit e8332ced4af5b4d8772f49d5f625ee4a1aa8ec07)
|
||||
---
|
||||
src/lib/pdf/pdfdocument.cpp | 16 +++++++++-------
|
||||
1 file changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/lib/pdf/pdfdocument.cpp b/src/lib/pdf/pdfdocument.cpp
|
||||
index 66ffcf6a..6f63f8ce 100644
|
||||
--- a/src/lib/pdf/pdfdocument.cpp
|
||||
+++ b/src/lib/pdf/pdfdocument.cpp
|
||||
@@ -274,8 +274,12 @@ int PdfDocument::fileSize() const
|
||||
return d->m_pdfData.size();
|
||||
}
|
||||
|
||||
-static QDateTime parsePdfDateTime(const GooString *str)
|
||||
+[[nodiscard]] static QDateTime parsePdfDateTime(const GooString *str)
|
||||
{
|
||||
+ if (!str) {
|
||||
+ return {};
|
||||
+ }
|
||||
+
|
||||
int year;
|
||||
int month;
|
||||
int day;
|
||||
@@ -286,7 +290,11 @@ static QDateTime parsePdfDateTime(const GooString *str)
|
||||
int tzMins;
|
||||
char tz;
|
||||
|
||||
+#if KPOPPLER_VERSION < QT_VERSION_CHECK(26, 3, 90)
|
||||
if (!parseDateString(str, &year, &month, &day, &hour, &min, &sec, &tz, &tzHours, &tzMins)) {
|
||||
+#else
|
||||
+ if (!parseDateString(str->toStr(), &year, &month, &day, &hour, &min, &sec, &tz, &tzHours, &tzMins)) {
|
||||
+#endif
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -308,18 +316,12 @@ static QDateTime parsePdfDateTime(const GooString *str)
|
||||
QDateTime PdfDocument::creationTime() const
|
||||
{
|
||||
std::unique_ptr<GooString> dt(d->m_popplerDoc->getDocInfoCreatDate());
|
||||
- if (!dt) {
|
||||
- return {};
|
||||
- }
|
||||
return parsePdfDateTime(dt.get());
|
||||
}
|
||||
|
||||
QDateTime PdfDocument::modificationTime() const
|
||||
{
|
||||
std::unique_ptr<GooString> dt(d->m_popplerDoc->getDocInfoModDate());
|
||||
- if (!dt) {
|
||||
- return {};
|
||||
- }
|
||||
return parsePdfDateTime(dt.get());
|
||||
}
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
# Template file for 'kitinerary'
|
||||
reverts="26.04.0_1"
|
||||
pkgname=kitinerary
|
||||
version=25.12.2
|
||||
revision=2
|
||||
version=26.04.1
|
||||
revision=1
|
||||
build_style=cmake
|
||||
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
|
||||
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
|
||||
@@ -20,7 +19,7 @@ license="LGPL-2.1-or-later"
|
||||
homepage="https://kontact.kde.org"
|
||||
changelog="https://kde.org/announcements/changelogs/gear/${version}/#kitinerary"
|
||||
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=6f5074ff8d4fd0640a7d0f37e9c14b3bb0316f121625c7d50513da706d439046
|
||||
checksum=5d1adc66de813d369730ee20bc8bec83af84e41075aea71f22fa200247b752ad
|
||||
|
||||
do_check() {
|
||||
cd build
|
||||
|
||||
Reference in New Issue
Block a user