Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-16 19:50:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gis/gdal: Apply upstream patch for the newer poppler.

Browse source 
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Matteo Bernardini 2021-10-05 16:19:54 +02:00 committed by Willy Sudiarto Raharjo
parent de13cd7657
commit 684ac84c1e
No known key found for this signature in database
GPG key ID: 3F617144D7238786
2 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gis/gdal/gdal.SlackBuild
View file

@ -82,6 +82,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p2 < $CWD/poppler.patch
# OpenCL, webp, Spatialite and Grass support need special arrangements.
# Everything else is handled automatically by configure.
WITHLIST=""

32
gis/gdal/poppler.patch Normal file
View file

@ -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 */