Date: Sunday, August 1, 2021 @ 20:00:33 Author: foutrelis Revision: 421012
archrelease: copy kde-unstable to kde-unstable-x86_64 Added: kitinerary/repos/kde-unstable-x86_64/PKGBUILD (from rev 421011, kitinerary/kde-unstable/PKGBUILD) kitinerary/repos/kde-unstable-x86_64/poppler-21.8.0.patch (from rev 421011, kitinerary/kde-unstable/poppler-21.8.0.patch) Deleted: kitinerary/repos/kde-unstable-x86_64/PKGBUILD ----------------------+ PKGBUILD | 62 ++++++++++++++++++++++++++----------------------- poppler-21.8.0.patch | 41 ++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 28 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-08-01 20:00:28 UTC (rev 421011) +++ PKGBUILD 2021-08-01 20:00:33 UTC (rev 421012) @@ -1,28 +0,0 @@ -# Maintainer: Antonio Rojas <aro...@archlinux.org> - -pkgname=kitinerary -pkgver=21.07.90 -pkgrel=1 -pkgdesc='Data model and extraction system for travel reservation information' -arch=(x86_64) -url='https://kontact.kde.org' -license=(LGPL) -depends=(kmime kpkpass kcalendarcore kcontacts poppler libphonenumber zxing-cpp) -makedepends=(extra-cmake-modules) -source=(https://download.kde.org/unstable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}) -sha256sums=('a70e41377b7f4984f171c084276d9358a3018fbe42ff150c95e7169f53bbfacd' - 'SKIP') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aa...@kde.org> - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <cf...@kde.org> - D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.bec...@kde.org> - -build() { - cmake -B build -S $pkgname-$pkgver \ - -DCMAKE_INSTALL_LIBEXECDIR=lib \ - -DBUILD_TESTING=OFF - cmake --build build -} - -package() { - DESTDIR="$pkgdir" cmake --install build -} Copied: kitinerary/repos/kde-unstable-x86_64/PKGBUILD (from rev 421011, kitinerary/kde-unstable/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-08-01 20:00:33 UTC (rev 421012) @@ -0,0 +1,34 @@ +# Maintainer: Antonio Rojas <aro...@archlinux.org> + +pkgname=kitinerary +pkgver=21.07.90 +pkgrel=2 +pkgdesc='Data model and extraction system for travel reservation information' +arch=(x86_64) +url='https://kontact.kde.org' +license=(LGPL) +depends=(kmime kpkpass kcalendarcore kcontacts poppler libphonenumber zxing-cpp) +makedepends=(extra-cmake-modules) +source=(https://download.kde.org/unstable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig} + poppler-21.8.0.patch) +sha256sums=('a70e41377b7f4984f171c084276d9358a3018fbe42ff150c95e7169f53bbfacd' + 'SKIP' + 'ac4cae76f3d4392c4dc3c41f0a0ee26d79c9937f4451736f64cd114bdaa94d28') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aa...@kde.org> + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <cf...@kde.org> + D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.bec...@kde.org> + +prepare() { + patch -Np1 -d $pkgname-$pkgver <poppler-21.8.0.patch +} + +build() { + cmake -B build -S $pkgname-$pkgver \ + -DCMAKE_INSTALL_LIBEXECDIR=lib \ + -DBUILD_TESTING=OFF + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} Copied: kitinerary/repos/kde-unstable-x86_64/poppler-21.8.0.patch (from rev 421011, kitinerary/kde-unstable/poppler-21.8.0.patch) =================================================================== --- poppler-21.8.0.patch (rev 0) +++ poppler-21.8.0.patch 2021-08-01 20:00:33 UTC (rev 421012) @@ -0,0 +1,41 @@ +diff -upr kitinerary-21.04.3.orig/src/lib/pdf/pdfdocument.cpp kitinerary-21.04.3/src/lib/pdf/pdfdocument.cpp +--- kitinerary-21.04.3.orig/src/lib/pdf/pdfdocument.cpp 2021-07-05 22:24:08.000000000 +0300 ++++ kitinerary-21.04.3/src/lib/pdf/pdfdocument.cpp 2021-08-01 22:44:05.114172443 +0300 +@@ -201,7 +201,14 @@ int PdfDocument::fileSize() const + } + + #ifdef HAVE_POPPLER +-static QDateTime parsePdfDateTime(const char *str) ++ ++#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0) ++#define KPOPPLER_DATE_STRING_TYPE GooString ++#else ++#define KPOPPLER_DATE_STRING_TYPE char ++#endif ++ ++static QDateTime parsePdfDateTime(const KPOPPLER_DATE_STRING_TYPE *str) + { + int year, month, day, hour, min, sec, tzHours, tzMins; + char tz; +@@ -233,7 +240,9 @@ QDateTime PdfDocument::creationTime() co + if (!dt) { + return {}; + } +-#if KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0) ++#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0) ++ return parsePdfDateTime(dt.get()); ++#elif KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0) + return parsePdfDateTime(dt->c_str()); + #else + return parsePdfDateTime(dt->getCString()); +@@ -250,7 +259,9 @@ QDateTime PdfDocument::modificationTime( + if (!dt) { + return {}; + } +-#if KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0) ++#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0) ++ return parsePdfDateTime(dt.get()); ++#elif KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0) + return parsePdfDateTime(dt->c_str()); + #else + return parsePdfDateTime(dt->getCString());