From nobody Sun Aug 25 11:33:07 2024 X-Original-To: dev-commits-ports-main@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 4WsBWR3k27z5VqV7; Sun, 25 Aug 2024 11:33:07 +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 4WsBWR3G2Nz4St7; Sun, 25 Aug 2024 11:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724585587; 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=4ze0OLZlDqx7QqKtH6dtSbAJ+wRsXKSzoSBFCZxU8cs=; b=GZbjzfreDICHno9Z1f9LG+Pm+LH0zj5pWD8Ea40cZq3Y54JAHdtvj0KaT8NdbtGi3KIbIY /2Id72Gy+bKeOoCpODkNWpcq35HYORWR75PkSk3mWjBWfZFiAZf3l0vu5i/+McC4scTPP4 z5J+iSWJsePanTEZVOsK8l59fg0CqiXFrFNNc5/tifbBv9hxGXH1IJm/W2IH6VE7ZhDVxO c60DhZ/AC6jA2BluppOUnSM1SV/Cnco/38LtnSK/OevXF5BouZI7av5zyyGZbVFnrVigA6 jd2M6EySYT9dz23iUv8E3hFZpJhCVnzlXtiWuZFFvXMwWq/x5sUJOrY5cE3TNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724585587; a=rsa-sha256; cv=none; b=sYV5yQ2gya4nJVF2pF286Ua6M1vkO2EgPC+Ye868FM0IBBtnpdm23Ojd07RY2IoWnvj7Px Jp3yKSrnjybRWdvzGJxsLEWsoNyEAGW5j2lfytub07c9nQIt5PXH39lIYx3YFpqmq4PS1d QHVngesxx5uGLhWUgU9lYw5ndyEmgXnoSRlueHF6KeYvekAkp46sv3X2z1AZIWeXPmG+9V k41PqSkDqwzqmj1s9npMEDoWoh6JzUnyx8J1y9lUWKzM/tm/jxpMkkZ3e4cLc+aFpObFdZ RkRWlzLhNxJdFuNHGgku2Og2cPtTqzul/286kXTj9Kehh/Do6SZHMP4GGQFGPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724585587; 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=4ze0OLZlDqx7QqKtH6dtSbAJ+wRsXKSzoSBFCZxU8cs=; b=Lz0gzQyYfDQe/Dijo+VZhFQ/9PACl95zp9GEfgiYSdgFTkuOK5BCwhqdJ9IvgODtISE+Wv x2s9Nj2w9VYtrOIQ/4OehlxP53RsqoVDxi9iLR0rHHJORBHfvccGiDfE363GufZG1O1fKS 15eJ4OBw+KcR9MWRy6kdnxz55meOQNdDA8hxq0fRLQuBicDtRB1tubkAVh/oBGYUqHEoMs Jj3XFqPklqwjmnGL/saPh87s+NrRvFHMFZ68aomgi+ikc/CKG2rvMZg1WTbg31/oTq/fgr 4yqztnvrXTnInir9+XuZ9Df3I0Brntktl5Fo9TAck/5dleaHZC59PDrFvMODxg== 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 4WsBWR2sLvzLVc; Sun, 25 Aug 2024 11:33:07 +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 47PBX7bm036972; Sun, 25 Aug 2024 11:33:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47PBX7Sq036969; Sun, 25 Aug 2024 11:33:07 GMT (envelope-from git) Date: Sun, 25 Aug 2024 11:33:07 GMT Message-Id: <202408251133.47PBX7Sq036969@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: 6a668853ee5c - main - databases/sfcgal: fix build with clang 19 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 6a668853ee5c59d92fc9dd6e4d2279d3e5a4eff1 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a668853ee5c59d92fc9dd6e4d2279d3e5a4eff1 commit 6a668853ee5c59d92fc9dd6e4d2279d3e5a4eff1 Author: Dimitry Andric AuthorDate: 2024-08-10 19:17:34 +0000 Commit: Dimitry Andric CommitDate: 2024-08-25 11:25:15 +0000 databases/sfcgal: fix build with clang 19 Clang 19 now diagnoses incorrect member accesses, which causes databases/sfcgal to fail with errors similar to: /wrkdirs/usr/ports/databases/sfcgal/work/CGAL-5.6.1/include/CGAL/boost/graph/iterator.h:219:22: error: no member named 'base' in 'Halfedge_around_source_iterator' 219 | return (! (this->base() == nullptr)); | ~~~~ ^ /wrkdirs/usr/ports/databases/sfcgal/work/CGAL-5.6.1/include/CGAL/boost/graph/iterator.h:313:22: error: no member named 'base' in 'Halfedge_around_target_iterator' 313 | return (! (this->base() == nullptr)); | ~~~~ ^ /wrkdirs/usr/ports/databases/sfcgal/work/CGAL-5.6.1/include/CGAL/boost/graph/iterator.h:405:22: error: no member named 'base' in 'Halfedge_around_face_iterator' 405 | return (! (this->base() == nullptr)); | ~~~~ ^ Upstream fixed this in https://github.com/CGAL/cgal/commit/0de060acd68 but it does not apply easily due to some changed context. Add a backported patch instead. PR: 280737 Approved by: maintainer timeout (2 weeks) MFH: 2024Q3 --- .../patch-include_CGAL_boost_graph_iterator.h | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/databases/sfcgal/files/patch-include_CGAL_boost_graph_iterator.h b/databases/sfcgal/files/patch-include_CGAL_boost_graph_iterator.h new file mode 100644 index 000000000000..b02e6b3a1723 --- /dev/null +++ b/databases/sfcgal/files/patch-include_CGAL_boost_graph_iterator.h @@ -0,0 +1,38 @@ +--- ../CGAL-5.6.1/include/CGAL/boost/graph/iterator.h 2024-02-24 21:04:12 UTC ++++ ../CGAL-5.6.1/include/CGAL/boost/graph/iterator.h +@@ -214,11 +214,6 @@ class Halfedge_around_source_iterator { (public) + + #ifndef DOXYGEN_RUNNING + +- explicit operator bool() const +- { +- return (! (this->base() == nullptr)); +- } +- + bool operator==( const Self& i) const { + CGAL_assertion( anchor == anchor); + return ( g == i.g) && ( pos == i.pos) && ( winding == i.winding); +@@ -308,11 +303,6 @@ class Halfedge_around_target_iterator { (public) + + #ifndef DOXYGEN_RUNNING + +- explicit operator bool() const +- { +- return (! (this->base() == nullptr)); +- } +- + bool operator==( const Self& i) const { + CGAL_assertion( anchor == anchor); + return ( g == i.g) && ( pos == i.pos) && ( winding == i.winding); +@@ -399,11 +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; } +- +- explicit operator bool() const +- { +- return (! (this->base() == nullptr)); +- } + + bool operator==( const Self& i) const { + CGAL_assertion( anchor == anchor);