From nobody Sun Oct 20 09:58:18 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 4XWYmC0x8rz5Yq9m; Sun, 20 Oct 2024 09:58:19 +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 4XWYmC0QCjz4PpV; Sun, 20 Oct 2024 09:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729418299; 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=2mtBYB+/+2qCD8Mrhk1nlMArhm7j3asJHTRxVhx1QX0=; b=wtN/w3DbuscUdEGIzEgfsW+FBLnju6b34gJ4mcGL0okqDUMeK3vPluB965ljSFz0gOlpk5 Vt6JK9va7oAKECx+oMpt2m1N7W35dpybXOIH5SGBgoaBpIYuoYt2prHi2QwQV/U4g7cU4d givuM4LjEMc+1QsYuGyTcTvMO+cU419A9BZu4ddOjQvoAKaUnnPnQn7jX0cmwJZMaONHNo i1ywSblZ1wJ5AaWKWiZzY+FRvoecsnRJs5vZTPLPsMDX27fHY+ZN2r/MZfdxKnyZZYjUmw mOBzgCCMrs56UEQ7jAgAXEgxNYdmmctT45DkMCAeWFWCZV0Ny1JFeqdDWanOBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729418299; 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=2mtBYB+/+2qCD8Mrhk1nlMArhm7j3asJHTRxVhx1QX0=; b=lvh85tA7ddMtkdi4TClhAVNzh71igTBuWxg6WDpFion5/XB7/goWpr++JkbI4uWgTIBX90 p5bWy0JSJH5u3CHquhUYUiSmiao6DJ/AHTRu3t7l5twQX/Tzswg52g2qw5RKECvqwOBaWY m5eDQRa5Tv3LJBak1akw9YdJEoaSgrWxAfPvH+KPmuhcAlG672VPs/DpBc9zGd66OVE4+D N88UxRko3gZg5hQQc6TGK5QQfb3LJ5rNF8UGKfcbw84b1CDC4qvLVdPUuHjKOorByIzefC e09vnBqebczHwPIZSoqbVlgnnaLdeY/4m3NAdAXurl3/LVLszmpwIytS3R5fEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729418299; a=rsa-sha256; cv=none; b=YIUicTeZUOoIOK2B3wT7Wi4mpHRy5ofpx5N+ywJRwMlUTDWqCfzBCXcyWUsN+cl3XkHbbs UwXigsluq8oNv0SJPMJWxK/XK/E5ViKFIRJ4fh0FPF08hhtZrjDOpB9o3hdNaCBjyZB2Xn 0qUB5OeZ5/ftuOLLV+LBgqmjg+CHFIPCDTQdXBVVD/kHPc5uMurnT53uD0Am9ddZnofitO WJAgpxekMtuf7wyiaJGAj1gH+4Qh0iKodENchlYODUA10MPvr68ajYbKECGGhkVg5Ifs10 RjtwHvWC43KO63ienlOBKqwcZzKbKgGPzLFbV15tdoX4TBm3L6xXfjB4/4EpKA== 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 4XWYmC019Wzwgc; Sun, 20 Oct 2024 09:58:19 +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 49K9wITi098222; Sun, 20 Oct 2024 09:58:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49K9wIiT098219; Sun, 20 Oct 2024 09:58:18 GMT (envelope-from git) Date: Sun, 20 Oct 2024 09:58:18 GMT Message-Id: <202410200958.49K9wIiT098219@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 5f8037e8c926 - 2024Q4 - 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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 5f8037e8c926def9d6e9d13f4038502f6ea82c30 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f8037e8c926def9d6e9d13f4038502f6ea82c30 commit 5f8037e8c926def9d6e9d13f4038502f6ea82c30 Author: Dimitry Andric AuthorDate: 2024-10-05 22:59:13 +0000 Commit: Dimitry Andric CommitDate: 2024-10-20 09:58:05 +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 (cherry picked from commit 54b05f1c1eb7a7d7d8ffa823c19babe8dae9fc66) --- 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);