<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/51f157894ac6a85e93c7a220100769694d4b5990">https://github.com/macports/macports-ports/commit/51f157894ac6a85e93c7a220100769694d4b5990</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 51f157894ac6a85e93c7a220100769694d4b5990
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Dec 9 02:15:08 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> gdal: fix build with poppler variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Apply upstream patches.
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port either builds correctly or not at all.
</span>---
gis/gdal/Portfile | 3 +
gis/gdal/files/patch-poppler.diff | 122 ++++++++++++++++++++++++++++++++++++++
2 files changed, 125 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b17a5dd..23fde4a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,6 +51,9 @@ platform darwin {
</span> # see https://trac.macports.org/ticket/58948
patchfiles-append patch-bash-completion-location.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# apply upstream patches to fix build against recent versions of Poppler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-poppler.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # this can be removed in a future version of MacPorts
# see https://github.com/macports/macports-base/pull/161
compiler.blacklist-append {clang < 800}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-poppler.diff b/gis/gdal/files/patch-poppler.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8b3fcc5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/files/patch-poppler.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,122 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7318576fc7037412b755f038f8148f2d299587aa Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Even Rouault <even.rouault@spatialys.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 26 Nov 2019 14:33:32 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] PDF: fix to build against latest Poppler master (0.83dev)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdal/frmts/pdf/pdfio.cpp | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdal/frmts/pdf/pdfio.h | 7 ++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 9 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdal/frmts/pdf/pdfio.cpp b/gdal/frmts/pdf/pdfio.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 917e92330ae..c0b9dad93cb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- frmts/pdf/pdfio.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ frmts/pdf/pdfio.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -170,6 +170,9 @@ getStart_ret_type VSIPDFFileStream::getStart()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /************************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ StreamKind VSIPDFFileStream::getKind()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return strFile;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdal/frmts/pdf/pdfio.h b/gdal/frmts/pdf/pdfio.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aa34ab7210d..23344d33f77 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- frmts/pdf/pdfio.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ frmts/pdf/pdfio.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,7 +81,12 @@ class VSIPDFFileStream final: public BaseStream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void setPos(setPos_offset_type pos, int dir = 0) override;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void moveStart(moveStart_delta_type delta) override;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- virtual StreamKind getKind() override;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ virtual StreamKind getKind()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ override;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual GooString *getFileName() override;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual int getChar() override;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Even Rouault <even.rouault@spatialys.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 22 Oct 2019 13:11:57 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdal/frmts/pdf/pdfdataset.cpp | 6 +++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 15537ca7fd7..8f944c40d30 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -205,7 +205,11 @@ class GDALPDFOutputDev : public SplashOutputDev
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void drawChar(GfxState *state, double x, double y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double dx, double dy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double originX, double originY,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CharCode code, int nBytes, Unicode *u, int uLen) override
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CharCode code, int nBytes,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Unicode *u, int uLen) override
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (bEnableText)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SplashOutputDev::drawChar(state, x, y, dx, dy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 94daceefebd464858888ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Even Rouault <even.rouault@spatialys.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 29 Sep 2019 23:55:18 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdal/frmts/pdf/pdfdataset.cpp | 7 ++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 6 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3d68f92abe8..b3db5374227 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -269,7 +269,12 @@ class GDALPDFOutputDev : public SplashOutputDev
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual void drawImage(GfxState *state, Object *ref, Stream *str,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int width, int height, GfxImageColorMap *colorMap,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GBool interpolate, int *maskColors, GBool inlineImg) override
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GBool interpolate,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int *maskColors,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GBool inlineImg) override
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (bEnableBitmap)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SplashOutputDev::drawImage(state, ref, str,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1f8fa16f58cfe0364099ddad0e1d86522d8de41a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Even Rouault <even.rouault@spatialys.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 13 Nov 2019 14:07:22 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] PDF: fix build against Poppler 0.83.0dev
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdal/frmts/pdf/pdfdataset.cpp | 6 ++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 6 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8f944c40d30..88017953de5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4074,7 +4074,13 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPLMutexHolderD(&hGlobalParamsMutex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* poppler global variable */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (globalParams == nullptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ globalParams.reset(new GlobalParams());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ globalParams = new GlobalParams();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ globalParams->setPrintCommands(CPLTestBool(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPLGetConfigOption("GDAL_PDF_PRINT_COMMANDS", "FALSE")));
</span></pre><pre style='margin:0'>
</pre>