<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/e0cd70bd30f4c422d1e5c5efee044a3056f8205b">https://github.com/macports/macports-ports/commit/e0cd70bd30f4c422d1e5c5efee044a3056f8205b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e0cd70bd30f4c422d1e5c5efee044a3056f8205b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Dec 9 02:17:31 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> gdal: update version 3.0.1->3.0.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/59776
</span>---
gis/gdal/Portfile | 10 +++----
gis/gdal/files/patch-poppler.diff | 55 +--------------------------------------
2 files changed, 6 insertions(+), 59 deletions(-)
<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 23fde4a..85083e9 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;'>@@ -10,8 +10,8 @@ PortGroup legacysupport 1.0
</span> PortGroup conflicts_build 1.0
mpi.setup
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup OSGeo gdal 3.0.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OSGeo gdal 3.0.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories gis
license MIT BSD
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,9 @@ long_description GDAL is a translator library for raster geospatial \
</span>
homepage https://www.gdal.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a0b7be0a5e21d3eef8884783c94963c2f91e6f3d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f6b8147f031cb93291535c3d632e8cacdb8f445b9f9b0e3eb8cff7a8d3f76359 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 22392099
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bfe758959a3358a3974ab4417a1ad3bdbe85c489 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c45054df0fb31b80c6a419507da4719f81e0247a2045dd7c37befb6a8b1a6e6e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22418551
</span>
worksrcdir ${worksrcpath}/gdal
<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><span style='display:block; white-space:pre;color:#808080;'>index 8b3fcc5..1476b4e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-poppler.diff
</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;'>@@ -40,59 +40,6 @@ index aa34ab7210d..23344d33f77 100644
</span> virtual GooString *getFileName() override;
virtual int getChar() override;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Even Rouault <even.rouault@spatialys.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 22 Oct 2019 13:11:57 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdal/frmts/pdf/pdfdataset.cpp | 6 +++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 5 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 15537ca7fd7..8f944c40d30 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -205,7 +205,11 @@ class GDALPDFOutputDev : public SplashOutputDev
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void drawChar(GfxState *state, double x, double y,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double dx, double dy,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double originX, double originY,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CharCode code, int nBytes, Unicode *u, int uLen) override
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CharCode code, int nBytes,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Unicode *u, int uLen) override
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (bEnableText)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SplashOutputDev::drawChar(state, x, y, dx, dy,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 94daceefebd464858888ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Even Rouault <even.rouault@spatialys.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 29 Sep 2019 23:55:18 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdal/frmts/pdf/pdfdataset.cpp | 7 ++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 6 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3d68f92abe8..b3db5374227 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -269,7 +269,12 @@ class GDALPDFOutputDev : public SplashOutputDev
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void drawImage(GfxState *state, Object *ref, Stream *str,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int width, int height, GfxImageColorMap *colorMap,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GBool interpolate, int *maskColors, GBool inlineImg) override
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GBool interpolate,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int *maskColors,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GBool inlineImg) override
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (bEnableBitmap)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SplashOutputDev::drawImage(state, ref, str,
</span> 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
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +53,7 @@ diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
</span> index 8f944c40d30..88017953de5 100644
--- frmts/pdf/pdfdataset.cpp
+++ frmts/pdf/pdfdataset.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4074,7 +4074,13 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4076,7 +4076,13 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
</span> CPLMutexHolderD(&hGlobalParamsMutex);
/* poppler global variable */
if (globalParams == nullptr)
</pre><pre style='margin:0'>
</pre>