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 92EB1158064 for ; Tue, 7 May 2024 12:52:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC70E2BC015; Tue, 7 May 2024 12:52:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C4DB72BC015 for ; Tue, 7 May 2024 12:52: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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08475343147 for ; Tue, 7 May 2024 12:52:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88E411664 for ; Tue, 7 May 2024 12:52:35 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1715086333.9161542718b9840ff37f5c27b22b7c3a8e3fd214.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/files/, media-gfx/freecad/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch media-gfx/freecad/freecad-0.21.2-r2.ebuild media-gfx/freecad/freecad-9999.ebuild X-VCS-Directories: media-gfx/freecad/ media-gfx/freecad/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 9161542718b9840ff37f5c27b22b7c3a8e3fd214 X-VCS-Branch: master Date: Tue, 7 May 2024 12:52:35 +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: f05cddd8-8363-463e-95e9-604fce86acaf X-Archives-Hash: ac38433bdd547cf677ee0913dbc53922 commit: 9161542718b9840ff37f5c27b22b7c3a8e3fd214 Author: Yehoshua Pesach Wallach gmail com> AuthorDate: Sun Apr 7 15:51:09 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Tue May 7 12:52:13 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91615427 media-gfx/freecad: adds upstream patch for compiling with VTK-9.3 Closes: https://bugs.gentoo.org/928879 Signed-off-by: Yehoshua Pesach Wallach gmail.com> Closes: https://github.com/gentoo/gentoo/pull/36153 Signed-off-by: Andrew Ammerlaan gentoo.org> .../freecad/files/freecad-0.21.2-vtk9.3-fix.patch | 33 ++++++++++++++++++++++ media-gfx/freecad/freecad-0.21.2-r2.ebuild | 5 ++-- media-gfx/freecad/freecad-9999.ebuild | 4 +-- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch b/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch new file mode 100644 index 000000000000..b41e3618f55f --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch @@ -0,0 +1,33 @@ +# fix for compiling with VTK 9.3 +https://github.com/FreeCAD/FreeCAD/pull/11496/commits/68d380a64e033c40fcb9a6dc322d9e0178de52ee +Bug: https://forum.freecad.org/viewtopic.php?t=82814 +patch by adrianinsaval (commited in 68d380a64e033c40fcb9a6dc322d9e0178de52ee) + +--- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx ++++ b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx +@@ -39,10 +39,6 @@ + #define SMDS_EXPORT + #endif + +-#ifdef VTK_HAS_MTIME_TYPE + #define VTK_MTIME_TYPE vtkMTimeType +-#else +-#define VTK_MTIME_TYPE unsigned long +-#endif + + #endif +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp +@@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks() + GetLinks()->Allocate(this->GetNumberOfPoints()); + GetLinks()->Register(this); + //FIXME: vtk9 ++#if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0) + GetLinks()->BuildLinks(this); ++#else ++ GetLinks()->SetDataSet(this); ++ GetLinks()->BuildLinks(); ++#endif + GetLinks()->Delete(); + #else + this->links = smds_celllinks::new(); diff --git a/media-gfx/freecad/freecad-0.21.2-r2.ebuild b/media-gfx/freecad/freecad-0.21.2-r2.ebuild index 9d461dec5d65..b0f1d3fac470 100644 --- a/media-gfx/freecad/freecad-0.21.2-r2.ebuild +++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild @@ -73,8 +73,8 @@ RDEPEND=" net-misc/curl ) fem? ( - !qt6? ( =media-libs/coin-4.0.0 @@ -164,6 +164,7 @@ REQUIRED_USE=" PATCHES=( "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch "${FILESDIR}"/${PN}-0.21.1-Gentoo-specific-don-t-check-vcs.patch + "${FILESDIR}"/${PN}-0.21.2-vtk9.3-fix.patch ) DOCS=( CODE_OF_CONDUCT.md README.md ) diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 76f8dae4592e..ad9a9580164b 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -74,8 +74,8 @@ RDEPEND=" net-misc/curl ) fem? ( - !qt6? ( =media-libs/coin-4.0.0