From patchwork Mon Feb 24 08:43:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars Bilke X-Patchwork-Id: 39097 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4FA6C27BBEA; Mon, 24 Feb 2025 08:44:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9944327BBE9 for ; Mon, 24 Feb 2025 08:44:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmU4K-0008Pv-Kc; Mon, 24 Feb 2025 03:44:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tmU4J-0008Pe-CT for guix-patches@gnu.org; Mon, 24 Feb 2025 03:44:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmU4J-0004wP-1j for guix-patches@gnu.org; Mon, 24 Feb 2025 03:44:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=References:In-reply-to:From:Date:MIME-version:To:Subject; bh=Mdkhm9AOupllUrrPLyprgh1/Obvlzx6/BKeX7/mWd/Y=; b=HnAehYiUfB8X8HmvF0/5amIM5hqQB4D/q/LjhA3JuywL8w5aAN14K+fxFtYStL1vKNLsbzzWMLPGJbH5Y3twuwFtJHqomVQN2Xb9mJcMG6LRtvPbGDNl+iM4E4nEvpU7KW8Nr1pz3B0NK/kUvTYg1MT1EzYWpgX1E9xb1amL6vtZYF3YYxQCDXnXBObHE6w1sql7RJBAufKr2w5tuUo7jNmjymnWBveqEZJbFP1YFtfTach9iu514+klPzi1HtZLedjj+dHOUxslzWl3hjHsCLyse2qVcbVJP/QoXxJ2LxJQ4vD85VICQG+ZpDPmCyPVwp63DMN+mrraC6JoYC8YdA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmU4I-0000ba-BK; Mon, 24 Feb 2025 03:44:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76269] [PATCH 2/2] gnu: freecad: Add vtk 9.4.1 patch. Resent-From: Lars Bilke Original-Sender: "Debbugs-submit" Resent-CC: csantosb@inventati.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 24 Feb 2025 08:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76269 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76269@debbugs.gnu.org Cc: Lars Bilke , Cayetano Santos , Maxim Cournoyer X-Debbugs-Original-Xcc: Cayetano Santos , Maxim Cournoyer Received: via spool by 76269-submit@debbugs.gnu.org id=B76269.17403866392302 (code B ref 76269); Mon, 24 Feb 2025 08:44:02 +0000 Received: (at 76269) by debbugs.gnu.org; 24 Feb 2025 08:43:59 +0000 Received: from localhost ([127.0.0.1]:38336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmU4F-0000b3-1y for submit@debbugs.gnu.org; Mon, 24 Feb 2025 03:43:59 -0500 Received: from mailgate5.ufz.de ([141.65.7.212]:53592 helo=mailgate.ufz.de) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tmU46-0000aV-8x for 76269@debbugs.gnu.org; Mon, 24 Feb 2025 03:43:51 -0500 Received: from imap.intranet.ufz.de (dcs1.intranet.ufz.de [141.65.125.135]) by mailgate.ufz.de (Mailgate5-UFZ) with ESMTP id 53A9B16031D for <76269@debbugs.gnu.org>; Mon, 24 Feb 2025 09:43:49 +0100 (CET) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from conversion-daemon.imap.intranet.ufz.de by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) id <0SS600C00IVJ3300@imap.intranet.ufz.de> for 76269@debbugs.gnu.org; Mon, 24 Feb 2025 09:43:49 +0100 (CET) Received: from smtp1.ufz.de ([141.65.7.216]) by imap.intranet.ufz.de (Oracle Communications Messaging Server 8.0.2.6.20200227 64bit (built Feb 27 2020)) with ESMTPS id <0SS600ANDIX1F9B0@imap.intranet.ufz.de> for 76269@debbugs.gnu.org; Mon, 24 Feb 2025 09:43:49 +0100 (CET) Received: from envinf4.minotaur-alpha.ts.net (unknown [141.65.34.85]) (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 smtp1.ufz.de (smtp1-UFZ) with ESMTPSA id 256B780068; Mon, 24 Feb 2025 09:43:49 +0100 (CET) Date: Mon, 24 Feb 2025 09:43:34 +0100 From: Lars Bilke In-reply-to: <3e8105e24f1159665cdf543f49e280f183cc3667.1740386410.git.lars.bilke@ufz.de> Message-id: <952e5c6ef995a8e47e6b99355d7bd2c34f3f1ea5.1740386410.git.lars.bilke@ufz.de> X-Mailer: git-send-email 2.46.1 References: <3e8105e24f1159665cdf543f49e280f183cc3667.1740386410.git.lars.bilke@ufz.de> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/engineering.scm (freecad): Add vtk 9.4.1 patch. * gnu/local.mk: Add freecad vtk 9.4.1 patch to list. Change-Id: I9220aec757c2331a2dfa3eee9d0b84f774785de3 Reviewed-by: Maxim Cournoyer --- gnu/local.mk | 1 + gnu/packages/engineering.scm | 1 + gnu/packages/patches/freecad-vtk941.patch | 71 +++++++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 gnu/packages/patches/freecad-vtk941.patch diff --git a/gnu/local.mk b/gnu/local.mk index 45a9cb635e..35e1b5e6b6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1317,6 +1317,7 @@ dist_patch_DATA = \ %D%/packages/patches/fpc-reproducibility.patch \ %D%/packages/patches/fpc-glibc-2.34-compat.patch \ %D%/packages/patches/fpm-newer-clamp-fix.patch \ + %D%/packages/patches/freecad-vtk941.patch \ %D%/packages/patches/freedict-tools-fix-determinism.patch \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freeimage-libtiff-compat.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 234f4a2b03..d4d920cd08 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3173,6 +3173,7 @@ (define-public freecad (file-name (git-file-name name version)) (sha256 (base32 "0wwymcfgi0cybj7m6awflk8c7n6iy97lpgpfhfncx3zwvjrxv588")) + (patches (search-patches "freecad-vtk941.patch")) ;; remove on 1.1 release (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/freecad-vtk941.patch b/gnu/packages/patches/freecad-vtk941.patch new file mode 100644 index 0000000000..e05548a599 --- /dev/null +++ b/gnu/packages/patches/freecad-vtk941.patch @@ -0,0 +1,71 @@ +From fafff3a08b7a6212ce3417e08b18cb2fc8e7e868 Mon Sep 17 00:00:00 2001 +From: wmayer +Date: Mon, 16 Dec 2024 10:56:43 +0100 +Subject: [PATCH] smesh: Fix build failure with vtk 9.4 + +Fixes #18423 +--- + .../src/SMDS/SMDS_UnstructuredGrid.cpp | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp +index e9895d615717..4e9d6dc05764 100644 +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector& idNodesOldToNew, int n + } + } + +- if (this->FaceLocations) ++ vtkIdTypeArray* thisFaceLocations = GetFaceLocations(); ++ vtkIdTypeArray* thisFaces = GetFaces(); ++ if (thisFaceLocations) + { + vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New(); + newFaceLocations->Initialize(); + newFaceLocations->Allocate(newTypes->GetSize()); + vtkIdTypeArray *newFaces = vtkIdTypeArray::New(); + newFaces->Initialize(); +- newFaces->Allocate(this->Faces->GetSize()); ++ newFaces->Allocate(thisFaces->GetSize()); + for (int i = 0; i < oldCellSize; i++) + { + if (this->Types->GetValue(i) == VTK_EMPTY_CELL) +@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector& idNodesOldToNew, int n + if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON) + { + newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1); +- int oldFaceLoc = this->FaceLocations->GetValue(i); +- int nCellFaces = this->Faces->GetValue(oldFaceLoc++); ++ int oldFaceLoc = thisFaceLocations->GetValue(i); ++ int nCellFaces = thisFaces->GetValue(oldFaceLoc++); + newFaces->InsertNextValue(nCellFaces); + for (int n=0; nFaces->GetValue(oldFaceLoc++); ++ int nptsInFace = thisFaces->GetValue(oldFaceLoc++); + newFaces->InsertNextValue(nptsInFace); + for (int k=0; kFaces->GetValue(oldFaceLoc++); ++ int oldpt = thisFaces->GetValue(oldFaceLoc++); + newFaces->InsertNextValue(idNodesOldToNew[oldpt]); + } + } +@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector& idNodesOldToNew, int n + } + else + { +- this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces); ++ this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces); + } + + newPoints->Delete(); \ No newline at end of file