This commit is contained in:
Marc Deop 2021-12-29 09:31:52 +01:00
parent 480287cd03
commit 3aeb999400
4 changed files with 7 additions and 19 deletions

1
.gitignore vendored
View File

@ -27,3 +27,4 @@
/kitinerary-21.04.3.tar.xz
/kitinerary-21.08.2.tar.xz
/kitinerary-21.08.3.tar.xz
/kitinerary-21.12.0.tar.xz

View File

@ -1,15 +0,0 @@
--- kitinerary-21.04.3/src/lib/pdf/pdfdocument.cpp
+++ kitinerary-21.04.3/src/lib/pdf/pdfdocument.cpp
@@ -206,7 +206,12 @@ static QDateTime parsePdfDateTime(const
int year, month, day, hour, min, sec, tzHours, tzMins;
char tz;
+#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0)
+ GooString dateString(str);
+ if (!parseDateString(&dateString, &year, &month, &day, &hour, &min, &sec, &tz, &tzHours, &tzMins)) {
+#else
if (!parseDateString(str, &year, &month, &day, &hour, &min, &sec, &tz, &tzHours, &tzMins)) {
+#endif
return {};
}

View File

@ -8,7 +8,7 @@
%endif
Name: kf5-%{framework}
Version: 21.08.3
Version: 21.12.0
Release: 1%{?dist}
Summary: A library containing itinerary data model and itinerary extraction code
@ -23,8 +23,6 @@ URL: https://invent.kde.org/frameworks/%{framework}
%endif
Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{framework}-%{version}.tar.xz
Patch0: kf5-kitinerary-21.04.3-poppler-21.08.0.patch
# libical (and thus kcalendarcore) not on all arches for RHEL8.
%if 0%{?rhel} == 8
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
@ -32,6 +30,7 @@ ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
BuildRequires: extra-cmake-modules
BuildRequires: kf5-rpm-macros
BuildRequires: qt5-qtbase-private-devel
BuildRequires: cmake(KF5I18n)
@ -123,6 +122,9 @@ make test/fast ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||
%changelog
* Mon Dec 20 2021 Marc Deop <marcdeop@fedoraproject.org> - 21.12.0-1
- 21.12.0
* Tue Nov 02 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.08.3-1
- 21.08.3

View File

@ -1 +1 @@
SHA512 (kitinerary-21.08.3.tar.xz) = d1fa4fc7d2c5205b396a83b63b21d0d6de578984e8c3d02d18f8e96c88c0ea636b20dc3415e16dd1fb82584fb5591a010c7d774d28544813f6321562f157608d
SHA512 (kitinerary-21.12.0.tar.xz) = f5897814a4673b6f6a3562fd6c36e06ef224a8ba2306245e8f8cd584d32c0373b4616d11e15a388bc83510cbba6038108f5f5633a91972df70a20611572a9b07