[poppler] Update to 22.09.0.

rpm/0001-Revert-Require-the-newer-qt5-provided-by-the-new-bas.patch

@@ -1,4 +1,4 @@
-From 24f91cae91ea3f2624bbb0a0a66b10577b25da8b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Pekka Vuorela <pekka.vuorela@jolla.com>
 Date: Wed, 18 Aug 2021 10:50:18 +0300
 Subject: [PATCH] Revert "Require the newer qt5 provided by the new base CI"
@@ -13,10 +13,10 @@ This reverts commit 0b34c18882ee3920c5ab9e9b953b3bb642f1b198.
  5 files changed, 12 insertions(+), 8 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 305256a2..23575cb4 100644
+index b00618d8ea6ae49489947e6bb6ce90a878d0a7e0..2ef2bbb62d35202cc303b45950554e5a9213786a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -166,7 +166,7 @@ else()
+@@ -172,7 +172,7 @@ else()
  endif()
 
  if (ENABLE_QT5)
@@ -26,7 +26,7 @@ index 305256a2..23575cb4 100644
    find_package(Qt5Xml)
    find_package(Qt5Widgets)
 diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
-index 64e81601..58b42f5e 100644
+index 64e8160103051a193f8b4f43957a49d625e57da7..58b42f5e716f7b09ec1c3b57b7294021eb146678 100644
 --- a/qt5/CMakeLists.txt
 +++ b/qt5/CMakeLists.txt
 @@ -5,7 +5,7 @@ if(ENABLE_QT_STRICT_ITERATORS)
@@ -39,10 +39,10 @@ index 64e81601..58b42f5e 100644
 
  add_subdirectory(src)
 diff --git a/qt5/src/poppler-annotation.cc b/qt5/src/poppler-annotation.cc
-index 336a395b..58b06c8f 100644
+index 8378ea69e36b53ec54680c927a77638ac80fee59..4b249bdf870c00c4f3fa262fe0284a58f7c0e70d 100644
 --- a/qt5/src/poppler-annotation.cc
 +++ b/qt5/src/poppler-annotation.cc
-@@ -1371,7 +1371,7 @@ void Annotation::setModificationDate(const QDateTime &date)
+@@ -1517,7 +1517,7 @@ void Annotation::setModificationDate(const QDateTime &date)
 
      if (d->pdfAnnot) {
          if (date.isValid()) {
@@ -51,7 +51,7 @@ index 336a395b..58b06c8f 100644
              GooString *s = timeToDateString(&t);
              d->pdfAnnot->setModified(s);
              delete s;
-@@ -1408,7 +1408,7 @@ void Annotation::setCreationDate(const QDateTime &date)
+@@ -1556,7 +1556,7 @@ void Annotation::setCreationDate(const QDateTime &date)
      AnnotMarkup *markupann = dynamic_cast<AnnotMarkup *>(d->pdfAnnot);
      if (markupann) {
          if (date.isValid()) {
@@ -61,10 +61,10 @@ index 336a395b..58b06c8f 100644
              markupann->setDate(s);
              delete s;
 diff --git a/qt5/src/poppler-form.cc b/qt5/src/poppler-form.cc
-index b7c8213b..d83e66af 100644
+index a6d40910b8259d1ad23282c6eeeafded55638341..a200ce09d543b6e4afa7a8aafd8b1ef38f600454 100644
 --- a/qt5/src/poppler-form.cc
 +++ b/qt5/src/poppler-form.cc
-@@ -958,8 +958,8 @@ static CertificateInfoPrivate *createCertificateInfoPrivate(const X509Certificat
+@@ -985,8 +985,8 @@ static CertificateInfoPrivate *createCertificateInfoPrivate(const X509Certificat
          certPriv->nick_name = ci->getNickName().c_str();
 
          X509CertificateInfo::Validity certValidity = ci->getValidity();
@@ -75,23 +75,23 @@ index b7c8213b..d83e66af 100644
 
          const X509CertificateInfo::PublicKeyInfo &pkInfo = ci->getPublicKeyInfo();
          certPriv->public_key = QByteArray(pkInfo.publicKey.c_str(), pkInfo.publicKey.getLength());
-@@ -978,7 +978,7 @@ static CertificateInfoPrivate *createCertificateInfoPrivate(const X509Certificat
+@@ -1005,7 +1005,7 @@ static CertificateInfoPrivate *createCertificateInfoPrivate(const X509Certificat
  SignatureValidationInfo FormFieldSignature::validate(int opt, const QDateTime &validationTime) const
  {
      FormWidgetSignature *fws = static_cast<FormWidgetSignature *>(m_formData->fm);
 -    const time_t validationTimeT = validationTime.isValid() ? validationTime.toSecsSinceEpoch() : -1;
 +    const time_t validationTimeT = validationTime.isValid() ? validationTime.toTime_t() : -1;
-     SignatureInfo *si = fws->validateSignature(opt & ValidateVerifyCertificate, opt & ValidateForceRevalidation, validationTimeT);
+     SignatureInfo *si = fws->validateSignature(opt & ValidateVerifyCertificate, opt & ValidateForceRevalidation, validationTimeT, !(opt & ValidateWithoutOCSPRevocationCheck), opt & ValidateUseAIACertFetch);
 
      // get certificate info
 diff --git a/qt5/tests/poppler-forms.cpp b/qt5/tests/poppler-forms.cpp
-index c2175be8..1e0ceedb 100644
+index 5950969a666ca3e1cdd73db6cd21353bf3f0f016..7d379efe482bee6ea133617255d4c71eea0a9273 100644
 --- a/qt5/tests/poppler-forms.cpp
 +++ b/qt5/tests/poppler-forms.cpp
-@@ -259,7 +259,11 @@ int main(int argc, char **argv)
-                     else
+@@ -261,7 +261,11 @@ int main(int argc, char **argv)
                          std::cout << "\t\t\tSignerName: "
                                    << "(null)" << std::endl;
+                     }
 -                    const QDateTime sviTime = QDateTime::fromSecsSinceEpoch(svi.signingTime(), Qt::UTC);
 +                    // http://doc.qt.io/qt-5/qdatetime.html#fromTime_t-1
 +                    // Requires Qt 5.2 -> configure.ac update
@@ -101,6 +101,3 @@ index c2175be8..1e0ceedb 100644
                      std::cout << "\t\t\tSigningTime: " << sviTime.toString() << std::endl;
                  } break;
                  }
--- 
-2.31.1
-

rpm/0002-Don-t-build-qt5-demos.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Anton Thomasson <antonthomasson@gmail.com>
+Date: Fri, 2 Sep 2022 18:49:38 +0200
+Subject: [PATCH] Don't build qt5-demos
+
+---
+ qt5/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
+index 58b42f5e716f7b09ec1c3b57b7294021eb146678..d46e9b0d55f9b6e6937ab33c096e64de193f55d7 100644
+--- a/qt5/CMakeLists.txt
++++ b/qt5/CMakeLists.txt
+@@ -10,4 +10,4 @@ add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
+
+ add_subdirectory(src)
+ add_subdirectory(tests)
+-add_subdirectory(demos)
++#add_subdirectory(demos)

rpm/poppler.spec

@@ -1,5 +1,5 @@
 Name:           poppler
-Version:        21.08.0
+Version:        22.09.0
 Release:        1
 License:        (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
 Summary:        PDF rendering library
@@ -27,6 +27,7 @@ BuildRequires:  pkgconfig(libtiff-4)
 BuildRequires:  boost-devel
 
 Patch1: 0001-Revert-Require-the-newer-qt5-provided-by-the-new-bas.patch
+Patch2: 0002-Don-t-build-qt5-demos.patch
 
 %description
 Poppler is a PDF rendering library based on xpdf PDF viewer.