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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 38AC11581F3 for ; Mon, 25 Nov 2024 02:40:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E43CE08A8; Mon, 25 Nov 2024 02:40:37 +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 32BD1E08A8 for ; Mon, 25 Nov 2024 02:40:37 +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 01015343018 for ; Mon, 25 Nov 2024 02:40:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5666311DF for ; Mon, 25 Nov 2024 02:40:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1732502391.a7b9d39fa7b80783e7b7e47bf7ec67a296765a5d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/netgen/files/, media-gfx/netgen/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/netgen/files/netgen-6.2.2302-opencascade-7.8.0.patch media-gfx/netgen/netgen-6.2.2302.ebuild X-VCS-Directories: media-gfx/netgen/files/ media-gfx/netgen/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a7b9d39fa7b80783e7b7e47bf7ec67a296765a5d X-VCS-Branch: master Date: Mon, 25 Nov 2024 02:40:34 +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: 4ced8525-2a8f-4480-8347-3acb2c06b4e5 X-Archives-Hash: ddbea975a99d140b1fc87a432e5f66ac commit: a7b9d39fa7b80783e7b7e47bf7ec67a296765a5d Author: Sam James gentoo org> AuthorDate: Mon Nov 25 02:39:51 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Nov 25 02:39:51 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7b9d39f media-gfx/netgen: fix opencascade-7.8.0 compat Closes: https://bugs.gentoo.org/930171 Thanks-to: Michael Tulupov Signed-off-by: Sam James gentoo.org> .../files/netgen-6.2.2302-opencascade-7.8.0.patch | 147 +++++++++++++++++++++ media-gfx/netgen/netgen-6.2.2302.ebuild | 1 + 2 files changed, 148 insertions(+) diff --git a/media-gfx/netgen/files/netgen-6.2.2302-opencascade-7.8.0.patch b/media-gfx/netgen/files/netgen-6.2.2302-opencascade-7.8.0.patch new file mode 100644 index 000000000000..0c5664edd6bb --- /dev/null +++ b/media-gfx/netgen/files/netgen-6.2.2302-opencascade-7.8.0.patch @@ -0,0 +1,147 @@ +https://bugs.gentoo.org/930171 +https://github.com/NGSolve/netgen/issues/170 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -372,25 +372,20 @@ if (USE_OCC) + TKGeomAlgo + TKGeomBase + TKHLR +- TKIGES + TKLCAF + TKMath + TKMesh + TKOffset + TKPrim +- TKSTEP +- TKSTEP209 +- TKSTEPAttr +- TKSTEPBase +- TKSTL ++ TKDESTL + TKService + TKShHealing + TKTopAlgo + TKV3d + TKVCAF + TKXCAF +- TKXDEIGES +- TKXDESTEP ++ TKDEIGES ++ TKDESTEP + TKXSBase + TKernel + ) +--- a/libsrc/occ/Partition_Loop3d.hxx ++++ b/libsrc/occ/Partition_Loop3d.hxx +@@ -10,27 +10,16 @@ + #ifndef _Partition_Loop3d_HeaderFile + #define _Partition_Loop3d_HeaderFile + +-#ifndef _TopTools_ListOfShape_HeaderFile +-#include +-#endif +-#ifndef _TopTools_IndexedDataMapOfShapeListOfShape_HeaderFile +-#include +-#endif +-#ifndef _Standard_Boolean_HeaderFile ++#include + #include +-#endif +-#ifndef _Standard_Real_HeaderFile + #include +-#endif +-#ifndef _Standard_Version_HeaderFile +-#include +-#endif ++#include ++#include + +-#if OCC_VERSION_HEX < 0x070000 ++#if OCC_VERSION_HEX < 0x070000 || OCC_VERSION_HEX > 0x070799 + #else + #include + #include +- #include + #endif + + class TopoDS_Shape; +@@ -38,6 +27,8 @@ class TopoDS_Shape; + #if OCC_VERSION_HEX < 0x070000 + class TopTools_ListOfShape; + class TopTools_MapOfOrientedShape; ++#else ++#include + #endif + + class TopoDS_Edge; +--- a/libsrc/occ/occ_edge.cpp ++++ b/libsrc/occ/occ_edge.cpp +@@ -55,7 +55,11 @@ namespace netgen + + size_t OCCEdge::GetHash() const + { ++#if OCC_VERSION_HEX < 0x070800 + return edge.HashCode(std::numeric_limits::max()); ++#else ++ return std::hash{}(edge); ++#endif + } + + void OCCEdge::ProjectPoint(Point<3>& p, EdgePointGeomInfo* gi) const +--- a/libsrc/occ/occ_face.cpp ++++ b/libsrc/occ/occ_face.cpp +@@ -32,7 +32,11 @@ namespace netgen + + size_t OCCFace::GetHash() const + { ++#if OCC_VERSION_HEX < 0x070800 + return face.HashCode(std::numeric_limits::max()); ++#else ++ return std::hash{}(face); ++#endif + } + + Point<3> OCCFace::GetCenter() const +--- a/libsrc/occ/occ_solid.hpp ++++ b/libsrc/occ/occ_solid.hpp +@@ -16,8 +16,11 @@ namespace netgen + OCCSolid(TopoDS_Shape dshape) + : solid(TopoDS::Solid(dshape)) + { } +- ++#if OCC_VERSION_HEX < 0x070800 + size_t GetHash() const override { return solid.HashCode(std::numeric_limits::max()); } ++#else ++ size_t GetHash() const override { return std::hash{}(solid); } ++#endif + }; + } + +--- a/libsrc/occ/occ_vertex.cpp ++++ b/libsrc/occ/occ_vertex.cpp +@@ -19,6 +19,10 @@ namespace netgen + + size_t OCCVertex::GetHash() const + { ++#if OCC_VERSION_HEX < 0x070800 + return vertex.HashCode(std::numeric_limits::max()); ++#else ++ return std::hash{}(vertex); ++#endif + } + } +--- a/libsrc/occ/occgeom.cpp ++++ b/libsrc/occ/occgeom.cpp +@@ -1625,8 +1625,12 @@ + + // enumerate shapes and archive only integers + auto my_hash = [](const TopoDS_Shape & key) { ++#if OCC_VERSION_HEX < 0x070800 + auto occ_hash = key.HashCode(1<<31UL); + return std::hash()(occ_hash); ++#else ++ return std::hash{}(key); ++#endif + }; + TopTools_IndexedMapOfShape shape_map; + Array shape_list; diff --git a/media-gfx/netgen/netgen-6.2.2302.ebuild b/media-gfx/netgen/netgen-6.2.2302.ebuild index 5a86024f6f64..5b3aa9d3d837 100644 --- a/media-gfx/netgen/netgen-6.2.2302.ebuild +++ b/media-gfx/netgen/netgen-6.2.2302.ebuild @@ -74,6 +74,7 @@ PATCHES=( "${FILESDIR}/${PN}-6.2.2204-disable-python-tests.patch" "${FILESDIR}/${PN}-6.2.2301-find-libjpeg-turbo-library.patch" "${FILESDIR}/${PN}-6.2.2301-fix-nullptr-deref-in-archive.patch" + "${FILESDIR}/${PN}-6.2.2302-opencascade-7.8.0.patch" ) pkg_setup() {