<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9d4dd1237b7a63dbe393e105fe3462962b823de4">https://github.com/macports/macports-ports/commit/9d4dd1237b7a63dbe393e105fe3462962b823de4</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 9d4dd1237b7 gdal-grass: update to 1.0.4
</span>9d4dd1237b7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9d4dd1237b7a63dbe393e105fe3462962b823de4
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Fri Jun 20 10:08:37 2025 +0200
<span style='display:block; white-space:pre;color:#404040;'> gdal-grass: update to 1.0.4
</span>---
gis/gdal-grass/Portfile | 12 ++--
gis/gdal-grass/files/patch_gdal_311.diff | 105 -------------------------------
2 files changed, 5 insertions(+), 112 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal-grass/Portfile b/gis/gdal-grass/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d463a8556c..ac5b5a9ab73 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal-grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal-grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@ name gdal-grass
</span>
# Due to upstream reset of version numbering after split from GDAL source repo,
# do not (re-)publish 1.4.3_0, 2.1.0_0, 2.1.0_1, 2.2.0_0, 2.2.0_1, or 2.2.0_2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.0.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> epoch 1
categories gis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,14 +24,12 @@ master_sites https://download.osgeo.org/gdal-grass/
</span> depends_lib port:gdal \
port:grass
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3b5251029254b72215614df2e0690f0e9fa87ffc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 eb000f9b953f3f2dc399e833969a2bc7f8f4637791add43240b69f77f382a71f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 344478
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e47332e7a4dd4c046469e84697a17c33dd0e0f4c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 78b6736df565f86b4cfac2f33877a49934cd058ba2bbe7bb4bc12f6a7bbae19b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 343903
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch_gdal_311.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url [lindex ${master_sites} 0]
livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)[quotemeta ${extract.suffix}]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal-grass/files/patch_gdal_311.diff b/gis/gdal-grass/files/patch_gdal_311.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9847c8c58a5..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal-grass/files/patch_gdal_311.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,105 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ogrgrass.h b/ogrgrass.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b1855a2..957e0be 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ogrgrass.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ogrgrass.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,6 +30,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef OGRGRASS_H_INCLUDED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define OGRGRASS_H_INCLUDED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "gdal_version.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "ogrsf_frmts.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,12 +57,19 @@ class OGRGRASSLayer final : public OGRLayer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return poFeatureDefn;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GIntBig GetFeatureCount(int) override;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OGRErr IGetExtent(int iGeomField, OGREnvelope *psExtent, bool bForce)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ override;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OGRErr GetExtent(OGREnvelope *psExtent, int bForce) override;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual OGRErr GetExtent(int iGeomField, OGREnvelope *psExtent,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int bForce) override
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return OGRLayer::GetExtent(iGeomField, psExtent, bForce);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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;'>- virtual OGRSpatialReference *GetSpatialRef() override;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int TestCapability(const char *) override;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,11 +81,16 @@ class OGRGRASSLayer final : public OGRLayer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Filters
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual OGRErr SetAttributeFilter(const char *query) override;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ virtual OGRErr ISetSpatialFilter(int iGeomField,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const OGRGeometry *poGeom) override;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void SetSpatialFilter(OGRGeometry *poGeomIn) override;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void SetSpatialFilter(int iGeomField, OGRGeometry *poGeom) override
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OGRLayer::SetSpatialFilter(iGeomField, poGeom);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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;'>- private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *pszName;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ogrgrasslayer.cpp b/ogrgrasslayer.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 09a6731..1af4762 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ogrgrasslayer.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ogrgrasslayer.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -643,11 +643,20 @@ bool OGRGRASSLayer::ResetSequentialCursor()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* SetSpatialFilter */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OGRErr OGRGRASSLayer::ISetSpatialFilter(int iGeomField,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const OGRGeometry *poGeomIn)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void OGRGRASSLayer::SetSpatialFilter(OGRGeometry *poGeomIn)
</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;'>- CPLDebug("GRASS", "SetSpatialFilter");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OGRLayer::ISetSpatialFilter(iGeomField, poGeomIn);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OGRLayer::SetSpatialFilter(poGeomIn);
</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;'>- if (poGeomIn == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -657,10 +666,14 @@ void OGRGRASSLayer::SetSpatialFilter(OGRGeometry *poGeomIn)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPLFree(paSpatialMatch);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- paSpatialMatch = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return;
</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;'>-- SetSpatialMatch();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SetSpatialMatch();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return OGRERR_NONE;
</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;'>- /************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1071,7 +1084,12 @@ GIntBig OGRGRASSLayer::GetFeatureCount(int bForce)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Returns OGRERR_NONE/OGRRERR_FAILURE. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OGRErr OGRGRASSLayer::IGetExtent(int /*iGeomField */, OGREnvelope *psExtent,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool /*bForce*/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OGRErr OGRGRASSLayer::GetExtent(OGREnvelope *psExtent, int /*bForce*/)
</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;'>- struct bound_box box;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>\ No newline at end of file
</pre><pre style='margin:0'>
</pre>