[arch-commits] Commit in gdal/trunk (PKGBUILD poppler-22.03.0.patch)

[Evangelos Foutras]

    Date: Wednesday, March 2, 2022 @ 11:20:07
  Author: foutrelis
Revision: 1139432

Fix build with poppler 22.03.0

Added:
  gdal/trunk/poppler-22.03.0.patch
Modified:
  gdal/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |    5 +++++
 poppler-22.03.0.patch |   15 +++++++++++++++
 2 files changed, 20 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-02 11:06:25 UTC (rev 1139431)
+++ PKGBUILD	2022-03-02 11:20:07 UTC (rev 1139432)
@@ -19,8 +19,10 @@
 options=('!emptydirs')
 changelog=$pkgbase.changelog
 source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz
+        poppler-22.03.0.patch
         gdal-perl-vendor.patch)
 sha256sums=('ac7bd2bb9436f3fc38bc7309704672980f82d64b4d57627d27849259b8f71d5c'
+            'f17b4d6f2e20c34140faf2154f6a64cc4afe10b484a13a0cac3a894f2919f16e'
             '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed')
 
 prepare() {
@@ -29,6 +31,9 @@
 # Fix mandir
   sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
 
+# Fix build with poppler 22.03.0
+  patch -Np1 -i "${srcdir}"/poppler-22.03.0.patch
+
 # Fix Perl bindings installation path
   patch -Np0 -i "${srcdir}"/gdal-perl-vendor.patch
 }

Added: poppler-22.03.0.patch
===================================================================
--- poppler-22.03.0.patch	                        (rev 0)
+++ poppler-22.03.0.patch	2022-03-02 11:20:07 UTC (rev 1139432)
@@ -0,0 +1,15 @@
+diff -upr gdal-3.4.0.orig/frmts/pdf/pdfdataset.cpp gdal-3.4.0/frmts/pdf/pdfdataset.cpp
+--- gdal-3.4.0.orig/frmts/pdf/pdfdataset.cpp	2021-11-04 13:57:20.000000000 +0200
++++ gdal-3.4.0/frmts/pdf/pdfdataset.cpp	2022-03-02 13:17:56.964778481 +0200
+@@ -4322,7 +4322,11 @@ PDFDataset *PDFDataset::Open( GDALOpenIn
+         oObj.getObj()->initNull();
+         auto poStream = new VSIPDFFileStream(fp, pszFilename, oObj.getObj());
+ #endif
++#if POPPLER_MAJOR_VERSION > 22 || (POPPLER_MAJOR_VERSION == 22 && POPPLER_MINOR_VERSION >= 3)
++        poDocPoppler = new PDFDoc(poStream, std::nullopt, GooString(poUserPwd));
++#else
+         poDocPoppler = new PDFDoc(poStream, nullptr, poUserPwd);
++#endif
+         if( globalParamsCreatedByGDAL )
+             registerErrorCallback();
+         delete poUserPwd;