summaryrefslogtreecommitdiff
path: root/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch')
-rw-r--r--sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch
deleted file mode 100644
index f077f4632386..000000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1f8fa16f58cfe0364099ddad0e1d86522d8de41a Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 13 Nov 2019 14:07:22 +0100
-Subject: [PATCH] PDF: fix build against Poppler 0.83.0dev
-
----
- gdal/frmts/pdf/pdfdataset.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 8f944c40d30..88017953de5 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -4267,7 +4267,13 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
- CPLMutexHolderD(&hGlobalParamsMutex);
- /* poppler global variable */
- if (globalParams == nullptr)
-+ {
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
-+ globalParams.reset(new GlobalParams());
-+#else
- globalParams = new GlobalParams();
-+#endif
-+ }
-
- globalParams->setPrintCommands(CPLTestBool(
- CPLGetConfigOption("GDAL_PDF_PRINT_COMMANDS", "FALSE")));