From nobody Sun Oct 20 09:57:42 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XWYlV5kNhz5Ypm7; Sun, 20 Oct 2024 09:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XWYlV4wxQz4Pdj; Sun, 20 Oct 2024 09:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729418262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pIJNSCoOQXGVJD+6le5vpw9KBVqMu+pRN/0B3zRHEj8=; b=ftYv8ONncr80FxdhXyhLjS22aSvMsHKTJG+VjAD8h7uZBD7zB/toE+KDi5SpXK1JCBDqct 7PCfEasyKphv/pQdcKvrDrJG9iOqak5kZUXOAON2jH4oiGYZzwMBgYmabo2kI79fZiwY2M UPWKCEnLnHJKPHws135FK4Gbw9FFikzKphGdmF+SW7Z51THX59LnDKfMpWOHhGYG8HxMvE 0vd8bQ6lX+TMLdXXY8gEWQ0tx4cX+c5PO0MxmL6Rvbcwn04nzW2poqNiq/JLtjy9i86Rwi cnM3L6ugTspbtoeFiShT6h1P1g+DJfZLk+Y7byyww1b5O2Kr/fUPPjUZFQ5wrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729418262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pIJNSCoOQXGVJD+6le5vpw9KBVqMu+pRN/0B3zRHEj8=; b=n4wmuT1xVxf4jpTMWFrrN7EqTCNKLtfDdq/4OLnCF8KvdgRFhy6/yPwD0R2eY2K6St9PS8 Aj6T7f3LI6xvEv/Bkx6GOvYEvylk+a2YSKQR+1Sz2N4mm/JdqHkFYGkDOGjP0CgEG+k8Cu GhGfm3Um7ghaEa8hgmtTMi3XTS2iE8N38DK0sM185juT8usVTIgYqyUzQUQR3L7KSjvpoO 9y1M8EnIjOfk9lvmz2+4vxP6/gBB3LERl6rkUvndK+e36h0YF5mwYlr3nEDswFuMEpfULE UJA0drtYAoE6wCbaKFFkBvFG0Nm9hN5CfQ1oRGlJ1AP934JyRm9wQ7cr9l04hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729418262; a=rsa-sha256; cv=none; b=gSb35OiZrKgfqbvsagU2zo9bjNE1X9ky7yIox6DxCCEuKllnFR6D2k+oFrA6IEb9dVsgsK QzFf0WuZRzLYfIGILoS2zOQkMluiEJoL+SYGbOF+ll4U/OP1wquqtylifY4FGPkvDBSdic c9/szSN/LD781g5h1qJKa20XYuYFXOCR4sJZuAnfLTDVb+Uk02/OtqC1ljQ4F4YQhXbuUK 5nhDj3M3/sj2/9SitWE4EHp2duYhQt8D8j4+PiRE9afLuO2nrCNI/dAfv55kAF8hq5mu6P mHSHzKqoTUbD6fbFJihRsuaG4/Nw9Rz9kXJxc7YIziwKjvY/CFNyVcLq4McgCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XWYlV4G4wzx1Z; Sun, 20 Oct 2024 09:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49K9vg8X097886; Sun, 20 Oct 2024 09:57:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49K9vg4d097883; Sun, 20 Oct 2024 09:57:42 GMT (envelope-from git) Date: Sun, 20 Oct 2024 09:57:42 GMT Message-Id: <202410200957.49K9vg4d097883@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 54b05f1c1eb7 - main - math/cgal: fix headers for use with clang 19 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54b05f1c1eb7a7d7d8ffa823c19babe8dae9fc66 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=54b05f1c1eb7a7d7d8ffa823c19babe8dae9fc66 commit 54b05f1c1eb7a7d7d8ffa823c19babe8dae9fc66 Author: Dimitry Andric AuthorDate: 2024-10-05 22:59:13 +0000 Commit: Dimitry Andric CommitDate: 2024-10-20 09:57:11 +0000 math/cgal: fix headers for use with clang 19 Clang 19 has become more strict about errors in member functions, which results in errors building ports that use headers from math/cgal, such as cad/csxcad: In file included from /wrkdirs/usr/ports/cad/csxcad/work/CSXCAD-0.6.3/src/CSPrimPolyhedron.cpp:25: In file included from /wrkdirs/usr/ports/cad/csxcad/work/CSXCAD-0.6.3/src/CSPrimPolyhedron_p.h:6: In file included from /usr/local/include/CGAL/Polyhedron_3.h:25: In file included from /usr/local/include/CGAL/HalfedgeDS_default.h:23: In file included from /usr/local/include/CGAL/boost/graph/graph_traits_HalfedgeDS_default.h:15: In file included from /usr/local/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h:29: /usr/local/include/CGAL/boost/graph/iterator.h:224:22: error: no member named 'base' in 'Halfedge_around_source_iterator' 224 | return (! (this->base() == nullptr)) ? | ~~~~ ^ /usr/local/include/CGAL/boost/graph/iterator.h:324:22: error: no member named 'base' in 'Halfedge_around_target_iterator' 324 | return (! (this->base() == nullptr)) ? | ~~~~ ^ /usr/local/include/CGAL/boost/graph/iterator.h:423:22: error: no member named 'base' in 'Halfedge_around_face_iterator' 423 | return (! (this->base() == nullptr)) ? | ~~~~ ^ The problem is that the `base()` member function is only available when an iterator is derived from `boost::iterator_adaptor`, but the three iterators mentioned above, `Halfedge_around_source_iterator`, `Halfedge_around_target_iterator` and `Halfedge_around_face_iterator` are not. Upstream CGAL has done a bit more refactoring in this particular area, but is enough to cherry-pick the changes that remove the `operator bool_type() const` member functions, which reference the non-existing `base()` member function. Bump PORTREVISION to ensure dependent ports build against the fixed headers. PR: 281880 Approved by: maintainer timeout (2 weeks) MFH: 2024Q4 --- math/cgal/Makefile | 2 +- .../patch-include_CGAL_boost_graph_iterator.h | 59 ++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/math/cgal/Makefile b/math/cgal/Makefile index a06e69bc8721..c25dd21e17a8 100644 --- a/math/cgal/Makefile +++ b/math/cgal/Makefile @@ -1,6 +1,6 @@ PORTNAME= cgal PORTVERSION= 5.5.1 -PORTREVISION= 3 +PORTREVISION= 4 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_boost_graph_iterator.h b/math/cgal/files/patch-include_CGAL_boost_graph_iterator.h new file mode 100644 index 000000000000..20f360c1f045 --- /dev/null +++ b/math/cgal/files/patch-include_CGAL_boost_graph_iterator.h @@ -0,0 +1,59 @@ +--- include/CGAL/boost/graph/iterator.h.orig 2022-10-07 19:04:41 UTC ++++ include/CGAL/boost/graph/iterator.h +@@ -213,18 +213,7 @@ class Halfedge_around_source_iterator { (public) + {} + + #ifndef DOXYGEN_RUNNING +- // design patter: "safe bool" +- // will be replaced by explicit operator bool with C++11 +- typedef void (Halfedge_around_source_iterator::*bool_type)() const; + +- void this_type_does_not_support_comparisons() const {} +- +- operator bool_type() const +- { +- return (! (this->base() == nullptr)) ? +- &Halfedge_around_source_iterator::this_type_does_not_support_comparisons : 0; +- } +- + bool operator==( const Self& i) const { + CGAL_assertion( anchor == anchor); + return ( g == i.g) && ( pos == i.pos) && ( winding == i.winding); +@@ -313,18 +302,7 @@ class Halfedge_around_target_iterator { (public) + {} + + #ifndef DOXYGEN_RUNNING +- // design patter: "safe bool" +- // will be replaced by explicit operator bool with C++11 +- typedef void (Halfedge_around_target_iterator::*bool_type)() const; + +- void this_type_does_not_support_comparisons() const {} +- +- operator bool_type() const +- { +- return (! (this->base() == nullptr)) ? +- &Halfedge_around_target_iterator::this_type_does_not_support_comparisons : 0; +- } +- + bool operator==( const Self& i) const { + CGAL_assertion( anchor == anchor); + return ( g == i.g) && ( pos == i.pos) && ( winding == i.winding); +@@ -411,18 +389,6 @@ class Halfedge_around_face_iterator { (public) + const value_type& operator * ( ) const { return pos; } + pointer operator -> ( ) { return &pos; } + const value_type* operator -> ( ) const { return &pos; } +- +- // design patter: "safe bool" +- // will be replaced by explicit operator bool with C++11 +- typedef void (Halfedge_around_face_iterator::*bool_type)() const; +- +- void this_type_does_not_support_comparisons() const {} +- +- operator bool_type() const +- { +- return (! (this->base() == nullptr)) ? +- &Halfedge_around_face_iterator::this_type_does_not_support_comparisons : 0; +- } + + bool operator==( const Self& i) const { + CGAL_assertion( anchor == anchor);