summaryrefslogtreecommitdiffstats
path: root/source/kde/kde/patch/kitinerary
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-08-03 06:55:27 +0000
committer Eric Hameleers <alien@slackware.com>2021-08-03 18:00:00 +0200
commit0eea0f62d298c91818c5842cd7877a5052afc38b (patch)
tree1293dfd15c1cf845715b7eaa4a8b2288aa17b219 /source/kde/kde/patch/kitinerary
parent152965cf4d11ac18d5fdfe8f7202e4c0cd6cfb94 (diff)
downloadcurrent-0eea0f62d298c91818c5842cd7877a5052afc38b.tar.gz
current-0eea0f62d298c91818c5842cd7877a5052afc38b.tar.xz
Tue Aug 3 06:55:27 UTC 202120210803065527
a/libcgroup-0.41-x86_64-10.txz: Rebuilt. Added LANG=C to the build script. ap/diffutils-3.8-x86_64-1.txz: Upgraded. d/re2c-2.2-x86_64-1.txz: Upgraded. d/rust-1.54.0-x86_64-2.txz: Rebuilt. Move bash completions to /usr/share/bash-completion/completions/. Thanks to Robby Workman. kde/calligra-3.2.1-x86_64-10.txz: Rebuilt. Recompiled against poppler-21.08.0. kde/cantor-21.04.3-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.08.0. kde/kfilemetadata-5.84.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.08.0. kde/kile-2.9.93-x86_64-10.txz: Rebuilt. Recompiled against poppler-21.08.0. kde/kitinerary-21.04.3-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.08.0. kde/krita-4.4.5-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.08.0. kde/okular-21.04.3-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.08.0. l/jasper-2.0.33-x86_64-1.txz: Upgraded. l/poppler-21.08.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/python-charset-normalizer-2.0.4-x86_64-1.txz: Upgraded. n/libmbim-1.26.0-x86_64-1.txz: Upgraded. x/libXfont2-2.0.5-x86_64-1.txz: Upgraded. x/libXft-2.3.4-x86_64-1.txz: Upgraded. x/xeyes-1.2.0-x86_64-1.txz: Upgraded. x/xorg-cf-files-1.0.7-x86_64-1.txz: Upgraded. x/xwd-1.0.8-x86_64-1.txz: Upgraded. xfce/mousepad-0.5.6-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde/kde/patch/kitinerary')
-rw-r--r--source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch b/source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch
new file mode 100644
index 000000000..1bc9dc377
--- /dev/null
+++ b/source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch
@@ -0,0 +1,53 @@
+From e99d101e2bd4c32566e238ce1340a93781e19eee Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Mon, 2 Aug 2021 01:01:31 +0300
+Subject: [PATCH] Fix build with poppler 21.8.0
+
+parseDateString() now takes "const GooString *" as the date argument in
+order to support unicode date strings. Adjust parsePdfDateTime() to use
+the same string type (instead of "const char *") when compiling against
+poppler 21.8.0.
+
+https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/880
+---
+ src/lib/pdf/pdfdocument.cpp | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/pdf/pdfdocument.cpp b/src/lib/pdf/pdfdocument.cpp
+index 8f0f4cd..0eabf45 100644
+--- a/src/lib/pdf/pdfdocument.cpp
++++ b/src/lib/pdf/pdfdocument.cpp
+@@ -201,7 +201,11 @@ int PdfDocument::fileSize() const
+ }
+
+ #ifdef HAVE_POPPLER
++#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0)
++static QDateTime parsePdfDateTime(const GooString *str)
++#else
+ static QDateTime parsePdfDateTime(const char *str)
++#endif
+ {
+ int year, month, day, hour, min, sec, tzHours, tzMins;
+ char tz;
+@@ -233,7 +237,9 @@ QDateTime PdfDocument::creationTime() const
+ 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 +256,9 @@ QDateTime PdfDocument::modificationTime() const
+ 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());