# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1711315661 14400
# Node ID 80fbbf281737a86d5f425eb78f7a65520c9b05f4
# Parent  4293ce47b50ae54613d7243837dd2f691440bfb7
of-geometry: update to v4.1.0

* src/of-geometry.mk: update to v4.1.0

* src/of-geometry-1-cxx17.patch: deleted file

* dist-files.mk: remove ref to deleted file
(grafted from 8f0fda49179ab596388ea1faab13b55a570c6100)

diff -r 4293ce47b50a -r 80fbbf281737 dist-files.mk
--- a/dist-files.mk	Sun Mar 24 16:53:09 2024 -0400
+++ b/dist-files.mk	Sun Mar 24 17:27:41 2024 -0400
@@ -481,7 +481,6 @@
   of-ga.mk \
   of-general.mk \
   of-generate_html.mk \
-  of-geometry-1-cxx17.patch \
   of-geometry.mk \
   of-gsl-1-cross-fixes.patch \
   of-gsl.mk \
diff -r 4293ce47b50a -r 80fbbf281737 src/of-geometry-1-cxx17.patch
--- a/src/of-geometry-1-cxx17.patch	Sun Mar 24 16:53:09 2024 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-Make operator() const (no mutable state allowed).
-This was always implied but is required for std::set in C++17.
-
-$ diff -Naup ./src/martinez.cpp.orig ./src/martinez.cpp
---- ./src/martinez.cpp.orig	2020-02-03 04:35:21.000000000 +0100
-+++ ./src/martinez.cpp	2021-08-12 13:22:32.462499966 +0200
-@@ -26,7 +26,7 @@ void Martinez::print (SweepEvent& e)
- 
- // Compare two sweep events
- // Return true means that e1 is placed at the event queue after e2, i.e,, e1 is processed by the algorithm after e2
--bool Martinez::SweepEventComp::operator() (SweepEvent* e1, SweepEvent* e2) {
-+bool Martinez::SweepEventComp::operator() (const SweepEvent* e1, const SweepEvent* e2) const {
- 	if (e1->p.x > e2->p.x) // Different x-coordinate
- 		return true;
- 	if (e2->p.x > e1->p.x) // Different x-coordinate
-@@ -40,7 +40,7 @@ bool Martinez::SweepEventComp::operator(
- }
- 
- // e1 and a2 are the left events of line segments (e1->p, e1->other->p) and (e2->p, e2->other->p)
--bool Martinez::SegmentComp::operator() (SweepEvent* e1, SweepEvent* e2) {
-+bool Martinez::SegmentComp::operator() (const SweepEvent* e1, const SweepEvent* e2) const {
- 	if (e1 == e2)
- 		return false;
- 	if (signedArea (e1->p, e1->other->p, e2->p) != 0 || signedArea (e1->p, e1->other->p, e2->other->p) != 0) {
-
-$ diff -Naup ./src/martinez.h.orig ./src/martinez.h
---- ./src/martinez.h.orig	2020-02-03 04:35:21.000000000 +0100
-+++ ./src/martinez.h	2021-08-12 13:21:16.650607542 +0200
-@@ -38,7 +38,7 @@ private:
- 
- 	struct SweepEvent;
- 	struct SegmentComp : public binary_function<SweepEvent*, SweepEvent*, bool> { // for sorting edges in the sweep line
--		bool operator() (SweepEvent* e1, SweepEvent* e2);
-+		bool operator() (const SweepEvent* e1, const SweepEvent* e2) const;
- 	};
- 	
- 	struct SweepEvent {
-@@ -65,7 +65,7 @@ private:
- 	static void print (SweepEvent& e); // This function is intended for debugging purposes
- 
- 	struct SweepEventComp : public binary_function<SweepEvent*, SweepEvent*, bool> { // for sortening events
--		bool operator() (SweepEvent* e1, SweepEvent* e2);
-+		bool operator() (const SweepEvent* e1, const SweepEvent* e2) const;
- 	};
- 
- 	/** @brief Event Queue */
-
-$ diff -Naup ./src/polygon.cpp.orig ./src/polygon.cpp
---- ./src/polygon.cpp.orig	2020-02-03 04:35:21.000000000 +0100
-+++ ./src/polygon.cpp	2021-08-12 13:30:01.848702003 +0200
-@@ -94,7 +94,7 @@ void Polygon::move (double x, double y)
- namespace { // start of anonymous namespace
- 	struct SweepEvent;
- 	struct SegmentComp : public binary_function<SweepEvent*, SweepEvent*, bool> {
--		bool operator() (SweepEvent* e1, SweepEvent* e2);
-+		bool operator() (const SweepEvent* e1, const SweepEvent* e2) const;
- 	};
- 
- 	struct SweepEvent {
-@@ -117,7 +117,7 @@ namespace { // start of anonymous namesp
- 	};
- 
- 	struct SweepEventComp : public binary_function<SweepEvent*, SweepEvent*, bool> {
--		bool operator() (SweepEvent* e1, SweepEvent* e2) {
-+		bool operator() (const SweepEvent* e1, const SweepEvent* e2) const {
- 			if (e1->p.x < e2->p.x) // Different x coordinate
- 				return true;
- 			if (e2->p.x < e1->p.x) // Different x coordinate
-@@ -133,7 +133,7 @@ namespace { // start of anonymous namesp
- 
- } // end of anonymous namespace
- 
--bool SegmentComp::operator() (SweepEvent* e1, SweepEvent* e2) {
-+bool SegmentComp::operator() (const SweepEvent* e1, const SweepEvent* e2) const {
- 	if (e1 == e2)
- 		return false;
- 	if (signedArea (e1->p, e1->other->p, e2->p) != 0 || signedArea (e1->p, e1->other->p, e2->other->p) != 0) {
-
diff -r 4293ce47b50a -r 80fbbf281737 src/of-geometry.mk
--- a/src/of-geometry.mk	Sun Mar 24 16:53:09 2024 -0400
+++ b/src/of-geometry.mk	Sun Mar 24 17:27:41 2024 -0400
@@ -3,8 +3,8 @@
 
 PKG             := of-geometry
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.0.0
-$(PKG)_CHECKSUM := 1ebc1fbdf4d93e89879165affc2023e9a5bed473
+$(PKG)_VERSION  := 4.1.0
+$(PKG)_CHECKSUM := cce0768abd7d133bcc7c9999804660c86ef6d1f7
 $(PKG)_REMOTE_SUBDIR :=
 $(PKG)_SUBDIR   := geometry-$($(PKG)_VERSION)
 $(PKG)_FILE     := geometry-$($(PKG)_VERSION).tar.gz