Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Mar 2024 18:02:10 GMT
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 3f70a5476f29 - main - math/cgal: Fix with boost > 1.67
Message-ID:  <202403211802.42LI2AlI023204@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3f70a5476f29fe50b105884151d36c49c0e157ed

commit 3f70a5476f29fe50b105884151d36c49c0e157ed
Author:     Fernando ApesteguĂ­a <fernape@FreeBSD.org>
AuthorDate: 2024-03-17 21:00:18 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2024-03-21 17:58:37 +0000

    math/cgal: Fix with boost > 1.67
    
    prior() and next() have been moved to its own header.
    cad/PrusaSlicer fails to build when including Plane_3_Triangle_3_intersection.h
    
    PR:             277480
    Approved by:    maintainer’s time-out
---
 math/cgal/Makefile                                        |  2 +-
 ...ions__3_internal_Plane__3__Triangle__3__intersection.h | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/math/cgal/Makefile b/math/cgal/Makefile
index 83cd81f02a16..f514d6fccb89 100644
--- a/math/cgal/Makefile
+++ b/math/cgal/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cgal
 PORTVERSION=	5.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/${PORTNAME:tu}/${PORTNAME}/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
diff --git a/math/cgal/files/patch-include_CGAL_Intersections__3_internal_Plane__3__Triangle__3__intersection.h b/math/cgal/files/patch-include_CGAL_Intersections__3_internal_Plane__3__Triangle__3__intersection.h
new file mode 100644
index 000000000000..b0edfb582abb
--- /dev/null
+++ b/math/cgal/files/patch-include_CGAL_Intersections__3_internal_Plane__3__Triangle__3__intersection.h
@@ -0,0 +1,15 @@
+--- include/CGAL/Intersections_3/internal/Plane_3_Triangle_3_intersection.h.orig	2024-03-04 16:56:49 UTC
++++ include/CGAL/Intersections_3/internal/Plane_3_Triangle_3_intersection.h
+@@ -13,6 +13,12 @@
+ #ifndef CGAL_INTERNAL_INTERSECTIONS_PLANE_3_TRIANGLE_3_INTERSECTION_H
+ #define CGAL_INTERNAL_INTERSECTIONS_PLANE_3_TRIANGLE_3_INTERSECTION_H
+ 
++#include <boost/version.hpp>
++#if BOOST_VERSION >= 106700
++#include <boost/next_prior.hpp>
++#else
++#include <boost/utility.hpp>
++#endif
+ #include <CGAL/Intersection_traits_3.h>
+ #include <CGAL/Intersections_3/internal/Line_3_Plane_3_intersection.h>
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403211802.42LI2AlI023204>