Compare commits

...

19 Commits

Author SHA1 Message Date
Marc Deop i Argemí 0799b9e183 fix: update spec file 2022-10-15 13:35:54 +02:00
Marc Deop i Argemí 0498820282 22.08.2 2022-10-15 13:25:48 +02:00
Marc Deop i Argemí ef28fb9bc8 22.08.1 2022-09-08 14:12:53 +02:00
Marie Loise Nolden 0d356f0435 Update kf5-kitinerary.spec 2022-08-28 05:59:53 +00:00
Marc Deop cae0ec5e8a 22.08.0 2022-08-21 23:01:53 +02:00
Marek Kasik ed79ad9649 Rebuild for poppler-22.08.0 2022-08-08 13:02:26 +02:00
Fedora Release Engineering a84cf8d404 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 16:05:20 +00:00
Than Ngo 3af941128c 22.04.3 2022-07-18 18:19:40 +02:00
Jan Grulich 3fd038230c Rebuild (qt5) 2022-07-14 15:03:24 +02:00
Jan Grulich a4ad997e80 Rebuild (qt5) 2022-05-17 13:03:42 +02:00
Justin Zobel d123e6bef9 Update to 22.04.1 2022-05-12 20:32:05 +09:30
Justin Zobel 42d270bf4e Update to 22.04.0 2022-05-09 15:31:08 +09:30
Jan Grulich a9449fcf6a Rebuild (qt5) 2022-03-11 10:56:22 +01:00
Marc Deop 019d0e2989 21.12.3 2022-03-02 16:38:44 +01:00
Rex Dieter 12833e9dcc 21.12.2 2022-02-04 10:40:41 -06:00
Fedora Release Engineering 37808da1ee - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 14:39:09 +00:00
Marek Kasik 951753cd3f Rebuild for poppler-22.01.0 2022-01-18 17:38:49 +01:00
Marc Deop 570e3aaebd 21.12.1 2022-01-06 15:54:09 +01:00
Marc Deop 3aeb999400 21.12.0 2021-12-29 09:31:52 +01:00
4 changed files with 67 additions and 20 deletions

12
.gitignore vendored
View File

@ -27,3 +27,15 @@
/kitinerary-21.04.3.tar.xz
/kitinerary-21.08.2.tar.xz
/kitinerary-21.08.3.tar.xz
/kitinerary-21.12.0.tar.xz
/kitinerary-21.12.1.tar.xz
/kitinerary-21.12.2.tar.xz
/kitinerary-21.12.3.tar.xz
/kitinerary-22.04.0.tar.xz
/kitinerary-22.04.0.tar.xz
/kitinerary-22.04.1.tar.xz
/kitinerary-22.04.1.tar.xz
/kitinerary-22.04.3.tar.xz
/kitinerary-22.08.0.tar.xz
/kitinerary-22.08.1.tar.xz
/kitinerary-22.08.2.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: 22.08.2
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)
@ -53,8 +52,8 @@ BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(libxml-2.0)
%if 0%{?fedora}
BuildRequires: pkgconfig(poppler)
%if 0%{?fedora}
BuildRequires: libphonenumber-devel
BuildRequires: protobuf-devel
%endif
@ -123,6 +122,57 @@ make test/fast ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||
%changelog
* Fri Oct 14 2022 Marc Deop <marcdeop@fedoraproject.org> - 22.08.2-1
- 22.08.2
* Thu Sep 08 2022 Marc Deop <marcdeop@fedoraproject.org> - 22.08.1-1
- 22.08.1
* Fri Aug 19 2022 Marc Deop <marcdeop@fedoraproject.org> - 22.08.0-1
- 22.08.0
* Mon Aug 08 2022 Marek Kasik <mkasik@redhat.com> - 22.04.3-5
- Rebuild for poppler-22.08.0
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 22.04.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jul 18 2022 Than Ngo <than@redhat.com> - 22.04.3-3
- 22.04.3
* Thu Jul 14 2022 Jan Grulich <jgrulich@redhat.com> - 22.04.1-3
- Rebuild (qt5)
* Tue May 17 2022 Jan Grulich <jgrulich@redhat.com> - 22.04.1-2
- Rebuild (qt5)
* Thu May 12 2022 Justin Zobel <justin@1707.io> - 22.04.1-1
- Update to 22.04.1
* Mon May 09 2022 Justin Zobel <justin@1707.io> - 22.04.0-1
- Update to 22.04.0
* Fri Mar 11 2022 Jan Grulich <jgrulich@redhat.com> - 21.12.3-2
- Rebuild (qt5)
* Wed Mar 02 2022 Marc Deop <marcdeop@fedoraproject.org> - 21.12.3-1
- 21.12.3
* Fri Feb 04 2022 Rex Dieter <rdieter@fedoraproject.org> - 21.12.2-1
- 21.12.2
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.12.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Jan 18 2022 Marek Kasik <mkasik@redhat.com> - 21.12.1-2
- Rebuild for poppler-22.01.0
* Thu Jan 06 2022 Marc Deop <marcdeop@fedoraproject.org> - 21.12.1-1
- 21.12.1
* 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-22.08.2.tar.xz) = 186d56f7f102d1dc106c718d14c43defff43b65f0e151f072d351425df47b4ce17de6c40e73ee055501161015867d79c971689018f9d7cc0ce49e0d1f47014a2