<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4364d5e19ef5591737dc94e28ec00c8753d8591a">https://github.com/macports/macports-ports/commit/4364d5e19ef5591737dc94e28ec00c8753d8591a</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 4364d5e19ef octave-geometry: fix C++17 build
</span>4364d5e19ef is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4364d5e19ef5591737dc94e28ec00c8753d8591a
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Sat May 3 09:25:53 2025 -0500
<span style='display:block; white-space:pre;color:#404040;'> octave-geometry: fix C++17 build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://octave.discourse.group/t/geometry-package-installation/5915/8
</span>---
octave/octave-geometry/Portfile | 4 ++-
.../files/patch-binary_function.diff | 40 ++++++++++++++++++++++
2 files changed, 43 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/octave/octave-geometry/Portfile b/octave/octave-geometry/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d89aab15e7..f968d23a5e7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/octave/octave-geometry/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/octave/octave-geometry/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup sourceforge octave geometry 4.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
license GPL-3+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,3 +18,5 @@ checksums rmd160 2cc54a81198b03d1bf2d36d3fd745e745619a728 \
</span> size 113949
depends_lib-append port:octave-general
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-binary_function.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/octave/octave-geometry/files/patch-binary_function.diff b/octave/octave-geometry/files/patch-binary_function.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4177c322bc4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/octave/octave-geometry/files/patch-binary_function.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/martinez.h.orig 2024-03-16 17:56:04
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/martinez.h 2025-05-03 09:12:59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum PolygonType { SUBJECT, CLIPPING };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct SweepEvent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct SegmentComp : public binary_function<SweepEvent*, SweepEvent*, bool> { // for sorting edges in the sweep line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct SegmentComp : public std::function<bool(SweepEvent*, SweepEvent*)> { // for sorting edges in the sweep line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool operator() (SweepEvent* e1, SweepEvent* e2) const;
</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;'>+@@ -64,7 +64,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void print (SweepEvent& e); // This function is intended for debugging purposes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct SweepEventComp : public binary_function<SweepEvent*, SweepEvent*, bool> { // for sortening events
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct SweepEventComp : public std::function<bool(SweepEvent*, SweepEvent*)> { // for sortening events
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool operator() (SweepEvent* e1, SweepEvent* e2) const;
</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;'>+--- src/polygon.cpp.orig 2024-03-16 17:56:04
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/polygon.cpp 2025-05-03 09:14:28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,7 +93,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace { // start of anonymous namespace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct SweepEvent;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct SegmentComp : public binary_function<SweepEvent*, SweepEvent*, bool> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct SegmentComp : public std::function<bool(SweepEvent*, SweepEvent*)> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool operator() (SweepEvent* e1, SweepEvent* e2) const;
</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;'>+@@ -116,7 +116,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool above (const Point& x) const { return !below (x); }
</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;'>+- struct SweepEventComp : public binary_function<SweepEvent*, SweepEvent*, bool> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct SweepEventComp : public std::function<bool(SweepEvent*, SweepEvent*)> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool operator() (SweepEvent* e1, SweepEvent* e2) const {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (e1->p.x < e2->p.x) // Different x coordinate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span></pre><pre style='margin:0'>
</pre>