Add poppler-21.10.0.patch

3 files changed, 43 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aea120297671..fdc1856624b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gdal-hdf4
 	pkgdesc = A translator library for raster geospatial data formats, with support to HDF4 format (required to use MODIStsp tool). Based on gdal ArchLinux package version.
 	pkgver = 3.3.1
-	pkgrel = 4.0
+	pkgrel = 9.0
 	url = https://gdal.org/
 	changelog = gdal-hdf4.changelog
 	arch = x86_64
@@ -40,8 +40,10 @@ pkgbase = gdal-hdf4
 	conflicts = gdal
 	options = !emptydirs
 	source = https://download.osgeo.org/gdal/3.3.1/gdal-3.3.1.tar.xz
-	source = gdal-perl-vendor.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/gdal-perl-vendor.patch?h=packages/gdal
+	source = poppler-21.10.0.patch
+	source = gdal-perl-vendor.patch::https://raw.githubusercontent.com/archlinux/svntogit-community/packages/gdal/trunk/gdal-perl-vendor.patch
 	sha256sums = 48ab00b77d49f08cf66c60ccce55abb6455c3079f545e60c90ee7ce857bccb70
+	sha256sums = 3074318889631fa9a9f351feccedb4d7a368b56017cc3660276c7aac154af6de
 	sha256sums = 2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed
 
 pkgname = gdal-hdf4
diff --git a/PKGBUILD b/PKGBUILD
index 9b7410949215..8db9b4869581 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ provides=('gdal')
 conflicts=('gdal')
 pkgname=('gdal-hdf4' 'python-gdal-hdf4')
 pkgver=3.3.1
-pkgrel=4.0
+pkgrel=9.0
 pkgdesc="A translator library for raster geospatial data formats, with support to HDF4 format (required to use MODIStsp tool). Based on gdal ArchLinux package version."
 arch=('x86_64')
 url="https://gdal.org/"
@@ -24,8 +24,10 @@ optdepends=('postgresql: postgresql database support'
 options=('!emptydirs')
 changelog=$pkgbase.changelog
 source=(https://download.osgeo.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.tar.xz
-        gdal-perl-vendor.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/gdal-perl-vendor.patch?h=packages/gdal)
+        poppler-21.10.0.patch
+        gdal-perl-vendor.patch::https://raw.githubusercontent.com/archlinux/svntogit-community/packages/gdal/trunk/gdal-perl-vendor.patch)
 sha256sums=('48ab00b77d49f08cf66c60ccce55abb6455c3079f545e60c90ee7ce857bccb70'
+            '3074318889631fa9a9f351feccedb4d7a368b56017cc3660276c7aac154af6de'
             '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed')
 
 prepare() {
@@ -34,6 +36,9 @@ prepare() {
 # 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
 }
diff --git a/poppler-21.10.0.patch b/poppler-21.10.0.patch
new file mode 100644
index 000000000000..208bec000f26
--- /dev/null
+++ b/poppler-21.10.0.patch
@@ -0,0 +1,32 @@
+From 9c09870e374ca21d558101af3f4c09a6164fdfc3 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@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 */