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

[Evangelos Foutras]

    Date: Friday, October 8, 2021 @ 23:01:31
  Author: foutrelis
Revision: 1028109

Fix build with poppler 21.10.0

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

-----------------------+
 PKGBUILD              |    5 +++++
 poppler-21.10.0.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-08 22:46:06 UTC (rev 1028108)
+++ PKGBUILD	2021-10-08 23:01:31 UTC (rev 1028109)
@@ -19,8 +19,10 @@
 options=('!emptydirs')
 changelog=$pkgbase.changelog
 source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz
+        poppler-21.10.0.patch
         gdal-perl-vendor.patch)
 sha256sums=('48ab00b77d49f08cf66c60ccce55abb6455c3079f545e60c90ee7ce857bccb70'
+            '3074318889631fa9a9f351feccedb4d7a368b56017cc3660276c7aac154af6de'
             '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed')
 
 prepare() {
@@ -29,6 +31,9 @@
 # Fix mandir
   sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
 
+# Fix build with poppler 21.10.0
+  patch -Np2 -i "${srcdir}"/poppler-21.10.0.patch
+
 # Fix Perl bindings installation path
   patch -Np0 -i "${srcdir}"/gdal-perl-vendor.patch
 }

Added: poppler-21.10.0.patch
===================================================================
--- poppler-21.10.0.patch	                        (rev 0)
+++ poppler-21.10.0.patch	2021-10-08 23:01:31 UTC (rev 1028109)
@@ -0,0 +1,32 @@
+From 9c09870e374ca21d558101af3f4c09a6164fdfc3 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault at spatialys.com>
+Date: Sun, 26 Sep 2021 22:49:52 +0200
+Subject: [PATCH] Fix build against Poppler master
+
+---
+ gdal/frmts/pdf/pdfdataset.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
+index 9c4c28a6572..50a8154c756 100644
+--- a/gdal/frmts/pdf/pdfdataset.cpp
++++ b/gdal/frmts/pdf/pdfdataset.cpp
+@@ -5012,7 +5012,7 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+ #ifdef HAVE_POPPLER
+   if (bUseLib.test(PDFLIB_POPPLER))
+   {
+-    GooString* poMetadata = poCatalogPoppler->readMetadata();
++    auto poMetadata = poCatalogPoppler->readMetadata();
+     if (poMetadata)
+     {
+ #if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
+@@ -5026,7 +5026,9 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
+             const char * const apszMDList[2] = { pszContent, nullptr };
+             poDS->SetMetadata(const_cast<char**>(apszMDList), "xml:XMP");
+         }
++#if (POPPLER_MAJOR_VERSION < 21 || (POPPLER_MAJOR_VERSION == 21 && POPPLER_MINOR_VERSION <= 9))
+         delete poMetadata;
++#endif
+     }
+ 
+     /* Read Info object */