From nobody Sun Aug 25 11:38:14 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 4WsBdM0gZ1z5S7RN; Sun, 25 Aug 2024 11:38:15 +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 4WsBdL6tzzz4TMQ; Sun, 25 Aug 2024 11:38:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724585895; 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=NFaMNvnFPsqGAHS/I1g5m87bN3QaVebrW/1hGwnslSs=; b=ea9MmLVwIirQr+7GHEB0iQwDWdMlGHCL4c0tpydlWy/Pdv9eKR3VoDbz5lgXk66cscM1u0 IG6cv4LOEsZymWZWYQXLjDqbbOq/uFtBZt7Zk5GPRd1ovrG/zY6mwG7bt6fnezw51qiG16 iRE/7tCwq8mRhFuXaL1Ld39NvmJ0UEGiqMbgAzUV/3ydFlRWKXN2w2ThYUgU6OEcaZ92PC YkKyUURzhN6NGsQA3GQb0tDvT7XlMjvQ+WU16uvqMFpimCohJ7o88txon8FmzSDIeyIzzL JgHLymYXHQXiC8BrNrUzBeMo6MnKWoN+1MqAq2kWR0DklYqBF5FJ0/l6u2qHcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724585895; a=rsa-sha256; cv=none; b=EFmSZpGZgfF7FlS9Z0GYcStWvJxRxwq68cPdK0NB4QeY59x8Qvuw6BewYaQS6DiAUvOsqG /8vTrlrO3hPGVjN/2qc869wdCgA4X9/D1WPEbwPoKlNtFU5G9eBp5772wJXb8Zuscu6LFG RuHdXdzfkiMNgF/fsuNWAZrzqatrqF2zq0g+f140LXi/fv08FPHKbacncRBGq2irU0wYxE gITy0D0X7FAQI7mHCrcm5/fQHcTXObBS7s5jGCS4gn7klIAO3ZM3BNdiRnO0p2gUx9zbLO 4ynJ6WfM3UZ3Z9ACAHQ0W4eFGYKyBQjQ0tG49MFV1qUtdvQaqH0KdlFa7/8kAA== 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=1724585895; 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=NFaMNvnFPsqGAHS/I1g5m87bN3QaVebrW/1hGwnslSs=; b=KyhHhBSI6h+fTkLW6KagpiyMlLYErMgYoG5hEVS0Ul6zeUMRoVhSIemBZ5YKAY6brQVJfb sCdukns7ZNNf1yycaIRpc3XrOkYHEHpq6oaNiUpo+nriOpRH8f3x1mVB3nm7AWTRgyxT9z /4qfRAu9qIPrcFI4ZjVQFOwCGEAn7dh7QWu2Gz5249i4Pyzu/ATD8ONCUaIHNG/rQgnTue PV1u60ZNPCpV21rgpc4/EmLojA9RMbi28bkVpMAVjBB5SM50mejihfWm/PNK4wuHrevNas y6oh4Ll2dqViTFQzEJYtXwJplM/i2BRMsoJF4Ru+vgf7sgpWIr7p4+/WMmcJvQ== 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 4WsBdL6LLCzLQt; Sun, 25 Aug 2024 11:38:14 +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 47PBcEmH037866; Sun, 25 Aug 2024 11:38:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47PBcEQ8037863; Sun, 25 Aug 2024 11:38:14 GMT (envelope-from git) Date: Sun, 25 Aug 2024 11:38:14 GMT Message-Id: <202408251138.47PBcEQ8037863@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: b733ae96495f - 2024Q3 - databases/sfcgal: fix build 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/2024Q3 X-Git-Reftype: branch X-Git-Commit: b733ae96495fdd841d5955ddca4365927ddb5321 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=b733ae96495fdd841d5955ddca4365927ddb5321 commit b733ae96495fdd841d5955ddca4365927ddb5321 Author: Dimitry Andric AuthorDate: 2024-08-10 19:17:34 +0000 Commit: Dimitry Andric CommitDate: 2024-08-25 11:37:53 +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 (cherry picked from commit 6a668853ee5c59d92fc9dd6e4d2279d3e5a4eff1) --- .../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);