git: 5a133e19607d - main - cad/camotics: unbreak after the upgrade of lang/v8
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 22 Jul 2022 15:42:04 UTC
The branch main has been updated by thierry:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5a133e19607d5199549bbb28e2e90273663cea05
commit 5a133e19607d5199549bbb28e2e90273663cea05
Author: Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2022-07-22 13:43:26 +0000
Commit: Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2022-07-22 15:41:57 +0000
cad/camotics: unbreak after the upgrade of lang/v8
After the latest upgrade of v8, C! and CAMotics must be built with c++17
standard.
Obtained from: https://github.com/CauldronDevelopmentLLC/CAMotics/issues/369
Fixes: 0db7465f145a
Reported by: pkg-fallout
---
cad/camotics/Makefile | 3 ++-
cad/camotics/files/patch-src_camotics_contour_TriangleMesh.h | 11 +++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/cad/camotics/Makefile b/cad/camotics/Makefile
index 2e711b9a09d6..05caf682632f 100644
--- a/cad/camotics/Makefile
+++ b/cad/camotics/Makefile
@@ -1,6 +1,7 @@
PORTNAME= CAMotics
DISTVERSIONPREFIX= v
DISTVERSION= 1.2.2-rc1
+PORTREVISION= 1
CATEGORIES= cad
MAINTAINER= thierry@FreeBSD.org
@@ -52,7 +53,7 @@ PORTEXAMPLES= *
MAKE_ARGS+= cc="${CC}" \
cxx="${CXX}" \
- cxxstd="c++14" \
+ cxxstd="c++17" \
ccflags="${CCFLAGS}" \
cxxflags="${CXXFLAGS} ${QT5_INC}" \
linkflags="${LDFLAGS} ${QT5_LIBS}" \
diff --git a/cad/camotics/files/patch-src_camotics_contour_TriangleMesh.h b/cad/camotics/files/patch-src_camotics_contour_TriangleMesh.h
new file mode 100644
index 000000000000..02e8a834dddf
--- /dev/null
+++ b/cad/camotics/files/patch-src_camotics_contour_TriangleMesh.h
@@ -0,0 +1,11 @@
+--- src/camotics/contour/TriangleMesh.h.orig 2021-07-27 23:51:08 UTC
++++ src/camotics/contour/TriangleMesh.h
+@@ -52,7 +52,7 @@ namespace CAMotics {
+
+
+ struct VertexSort {
+- bool operator() (const Vertex *a, const Vertex *b) {return *a < *b;}
++ bool operator() (const Vertex *a, const Vertex *b) const {return *a < *b;}
+ };
+
+