<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cd5b7723084f0b24753ebb5d6a45404dab5e853f">https://github.com/macports/macports-ports/commit/cd5b7723084f0b24753ebb5d6a45404dab5e853f</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 cd5b772 gdal: Update to 3.0.4
</span>cd5b772 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cd5b7723084f0b24753ebb5d6a45404dab5e853f
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Sun May 3 15:21:20 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> gdal: Update to 3.0.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This triggers the required rebuild against a newer poppler after the
</span><span style='display:block; white-space:pre;color:#404040;'> recent poppler update.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> patch-poppler.diff was a backport from upstream and is thus no longer
</span><span style='display:block; white-space:pre;color:#404040;'> necessary.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60135
</span>---
gis/gdal/Portfile | 12 ++++--------
gis/gdal/files/patch-poppler.diff | 26 --------------------------
2 files changed, 4 insertions(+), 34 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 323dd68..52b1f99 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,7 @@ 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.3 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.4 v
</span> categories gis
license MIT BSD
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +29,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 6ea83500ec05f5e1637fe41ae0154d0dafcc8320 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5438eb229f4b81b2f79fb33bbbf595d69d93ab012209a56f0d89d3c8e5d8558f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 22458176
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f62ce267a922d8185dc78c898a53385f7765fe94 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 af98d7cdb1962ac9dc27f5868e79c261924ecff0ea70d220be592492bff69ede \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22468853
</span>
worksrcdir ${worksrcpath}/gdal
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,9 +45,6 @@ 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:#ffe0e0;'>-# see https://github.com/OSGeo/gdal/commit/d587c2b056cd37a9bf51bf8afa1b740e16c7ba2b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-poppler.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a7ff328..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- frmts/pdf/pdfdataset.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2580,7 +2580,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPLError(CE_Failure, CPLE_AppDefined, "%s", osError.c_str());
</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;'>--static void PDFDatasetErrorFunction(void* /* userData*/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void PDFDatasetErrorFunction(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !(POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 85)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void* /* userData*/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ErrorCategory /* eErrCategory */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Goffset nPos,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4085,7 +4088,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GooString* poUserPwd = nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Set custom error handler for poppler errors */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 85
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setErrorCallback(PDFDatasetErrorFunction);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setErrorCallback(PDFDatasetErrorFunction, nullptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- CPLMutexHolderD(&hGlobalParamsMutex);
</span></pre><pre style='margin:0'>
</pre>