<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/51a1960ff4b823105bb372db6963c48139171091">https://github.com/macports/macports-ports/commit/51a1960ff4b823105bb372db6963c48139171091</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 51a1960 gdal: allow build with latest version of poppler
</span>51a1960 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 51a1960ff4b823105bb372db6963c48139171091
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Feb 22 12:14:13 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gdal: allow build with latest version of poppler
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/OSGeo/gdal/commit/d587c2b056cd37a9bf51bf8afa1b740e16c7ba2b
</span>---
gis/gdal/Portfile | 3 +++
gis/gdal/files/patch-poppler.diff | 26 ++++++++++++++++++++++++++
2 files changed, 29 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 dd01010..312628b 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;'>+# see https://github.com/OSGeo/gdal/commit/d587c2b056cd37a9bf51bf8afa1b740e16c7ba2b
</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..a7ff328
</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,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- frmts/pdf/pdfdataset.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2580,7 +2580,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPLError(CE_Failure, CPLE_AppDefined, "%s", osError.c_str());
</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;'>+-static void PDFDatasetErrorFunction(void* /* userData*/,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void PDFDatasetErrorFunction(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !(POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 85)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void* /* userData*/,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ErrorCategory /* eErrCategory */,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Goffset nPos,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4085,7 +4088,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GooString* poUserPwd = nullptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Set custom error handler for poppler errors */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 85
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ setErrorCallback(PDFDatasetErrorFunction);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setErrorCallback(PDFDatasetErrorFunction, nullptr);
</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;'>+ CPLMutexHolderD(&hGlobalParamsMutex);
</span></pre><pre style='margin:0'>
</pre>