From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AAA921581D3 for ; Fri, 31 May 2024 11:50:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2E05E2A2E; Fri, 31 May 2024 11:50:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B5D32E2A2E for ; Fri, 31 May 2024 11:50:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 83B84335DC3 for ; Fri, 31 May 2024 11:50:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D86891B9A for ; Fri, 31 May 2024 11:50:53 +0000 (UTC) From: "Guilherme Amadio" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guilherme Amadio" Message-ID: <1717156031.68c5c23d55b751e99870369a13212d390abe4f04.amadio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/, sci-physics/vgm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch sci-physics/vgm/vgm-5.2-r1.ebuild X-VCS-Directories: sci-physics/vgm/ sci-physics/vgm/files/ X-VCS-Committer: amadio X-VCS-Committer-Name: Guilherme Amadio X-VCS-Revision: 68c5c23d55b751e99870369a13212d390abe4f04 X-VCS-Branch: master Date: Fri, 31 May 2024 11:50:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 18498482-8851-4ba5-9823-f3dbd5116a4f X-Archives-Hash: c7b0c70a5f10a8bb91b33b01967348ff commit: 68c5c23d55b751e99870369a13212d390abe4f04 Author: Oliver Freyermuth googlemail com> AuthorDate: Thu May 30 20:41:01 2024 +0000 Commit: Guilherme Amadio gentoo org> CommitDate: Fri May 31 11:47:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c5c23d sci-physics/vgm: add patch for >=sci-physics/root-6.32.00 ROOT 6.32.00 carries an incompatible API change in TessellatedSolid, this backports an upstream fix to adapt to the API change. Closes: https://github.com/gentoo/gentoo/pull/36911 Signed-off-by: Oliver Freyermuth googlemail.com> Signed-off-by: Guilherme Amadio gentoo.org> .../vgm-5.2-r1-root-6.32-TesselatedSolid.patch | 31 ++++++++++++++++++++++ sci-physics/vgm/vgm-5.2-r1.ebuild | 4 +++ 2 files changed, 35 insertions(+) diff --git a/sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch b/sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch new file mode 100644 index 000000000000..2c1bfc92a349 --- /dev/null +++ b/sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch @@ -0,0 +1,31 @@ +adapt RootGM::TessellatedSolid for ROOT 6.32.00 + +Bug: https://github.com/vmc-project/vgm/pull/16 +--- + packages/RootGM/source/solids/TessellatedSolid.cxx | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +--- a/packages/RootGM/source/solids/TessellatedSolid.cxx ++++ b/packages/RootGM/source/solids/TessellatedSolid.cxx +@@ -178,13 +178,16 @@ VGM::ThreeVector RootGM::TessellatedSolid::Vertex(int ifacet, int index) const + { + CheckVertexIndex(ifacet, index); + +- const TGeoFacet& facet = fTessellated->GetFacet(ifacet); ++#if ROOT_VERSION_CODE > ROOT_VERSION(6, 30, 4) ++ const auto& rvertex = fTessellated->GetVertex((fTessellated->GetFacet(ifacet))[index]); ++#else ++ const auto& rvertex = fTessellated->GetFacet(ifacet).GetVertex(index); ++#endif + + VGM::ThreeVector vertex; +- vertex.push_back(facet.GetVertex(index).fVec[0] * RootGM::Units::Length()); +- vertex.push_back(facet.GetVertex(index).fVec[1] * RootGM::Units::Length()); +- vertex.push_back(facet.GetVertex(index).fVec[2] * RootGM::Units::Length()); ++ vertex.push_back(rvertex.fVec[0] * RootGM::Units::Length()); ++ vertex.push_back(rvertex.fVec[1] * RootGM::Units::Length()); ++ vertex.push_back(rvertex.fVec[2] * RootGM::Units::Length()); + + return vertex; + } +- diff --git a/sci-physics/vgm/vgm-5.2-r1.ebuild b/sci-physics/vgm/vgm-5.2-r1.ebuild index 6e5f9a755e9c..ff3c18921bb1 100644 --- a/sci-physics/vgm/vgm-5.2-r1.ebuild +++ b/sci-physics/vgm/vgm-5.2-r1.ebuild @@ -45,6 +45,10 @@ DOCS=( doc/VGMhistory.txt ) +PATCHES=( + "${FILESDIR}"/${PN}-5.2-r1-root-6.32-TesselatedSolid.patch +) + src_configure() { local mycmakeargs=( -DCLHEP_DIR="${EPREFIX}/usr"