diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-10-08 23:06:07 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-08 23:06:07 +0100 |
| commit | e23a08d0c97a0cc415aaa165da840b056f93c997 (patch) | |
| tree | 4c5f7db60483518201fef36f8cc0712789a08db2 /sci-libs/gdal/files | |
| parent | 391b5b359a346aff490103da7dddc85047f83830 (diff) | |
gentoo resync : 08.10.2021
Diffstat (limited to 'sci-libs/gdal/files')
| -rw-r--r-- | sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch b/sci-libs/gdal/files/gdal-3.3.2-poppler-21.10.0.patch new file mode 100644 index 000000000000..a727d21dab64 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.3.2-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 + +--- + frmts/pdf/pdfdataset.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp +index 9c4c28a6572..50a8154c756 100644 +--- a/frmts/pdf/pdfdataset.cpp ++++ b/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 */ |