From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id GFtvGIb1b2Y+MQEAqHPOHw:P1 (envelope-from ) for ; Mon, 17 Jun 2024 08:36:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id GFtvGIb1b2Y+MQEAqHPOHw (envelope-from ) for ; Mon, 17 Jun 2024 10:36:22 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1718613382; a=rsa-sha256; cv=none; b=gXx0Qk6HarPShjjLuCIWDNRVig8ukvqgeG5C2M3iMS/izPjwuLFyZJ8fuRji9Wf3YbM+1Y UtXjINIhIFjXHG6TimJ3boMzldNCfU8LhekPP2hFpr2LujqKQ+59ed07vYuYfTDN+ISUS0 1TBRCDjLG1thBNZkd/Gb8kqON1TxZj6vNo9zh6bdYcmBnCjyDZl1Fuj7iHxhLv0vHrAXgo FM4VFqZ3Q9sDQ7eHs/FORQnFKMNR5545AicyOseL/zfLNsIHMFCduKse7mQ7R8bjNCxa76 ezjVbrg+lsiHMYZx07DWCJheuUa/7tpjS38LQlkuYH8QLCPW5N9JLn18bvGM7Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1718613382; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=fYcgOO6QqppDS8A1slQEgKWhY6O4X3y4aw4Yn8vu598=; b=ppCHLjdEOmFfgnSi98tsbNSvdt26VWownUnI7RQNV7OesyfaBECr90KgM4irCr3vDPz7Z5 uCN9RUIU9phzbVycQxzyxO8oKd7MTlxEpv0oVCQXi2+Lai2+5jAZnmVMG5sEBOVhEmPruA b+BhWE0WGst6Ba1kdw0Mt15CUeByvimCpOfuCfMLbWLdwP8yUGS91ZKy+Tv1rovheWC7fb UBwNbapdyW+XGCRXIvZol2/sSG9Ocl0/2ri9/IfblonIBbHPn7HHDSSjJVEvzSIo3qj+kb Y+c4RJT/wjGvI0jWIGT58cGOUqcTQfsgL8/qTvorROfF9x97ZjTE00Yz5HDZIg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 144AA13123 for ; Mon, 17 Jun 2024 10:36:22 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJ7qM-0006Hy-AW; Mon, 17 Jun 2024 04:36:02 -0400 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 1sJ7qK-0006HL-JB for guix-patches@gnu.org; Mon, 17 Jun 2024 04:36:00 -0400 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 1sJ7qK-00087v-BM for guix-patches@gnu.org; Mon, 17 Jun 2024 04:36:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJ7qM-00033x-4s for guix-patches@gnu.org; Mon, 17 Jun 2024 04:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70323] [PATCH v3 2/2] gnu: freecad: patch for vtk 9.3.0 Resent-From: Lars Bilke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Jun 2024 08:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70323 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70323@debbugs.gnu.org Cc: andreas@enge.fr, Lars Bilke Received: via spool by 70323-submit@debbugs.gnu.org id=B70323.171861333211723 (code B ref 70323); Mon, 17 Jun 2024 08:36:02 +0000 Received: (at 70323) by debbugs.gnu.org; 17 Jun 2024 08:35:32 +0000 Received: from localhost ([127.0.0.1]:59539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJ7ps-000330-58 for submit@debbugs.gnu.org; Mon, 17 Jun 2024 04:35:32 -0400 Received: from mailgate4.ufz.de ([141.65.7.211]:40976 helo=mailgate.ufz.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJ7pq-00032e-34 for 70323@debbugs.gnu.org; Mon, 17 Jun 2024 04:35:31 -0400 Received: from imap.intranet.ufz.de (dcs1.intranet.ufz.de [141.65.125.135]) by mailgate.ufz.de (Mailgate4-UFZ) with ESMTP id 5D778160289; Mon, 17 Jun 2024 10:35:22 +0200 (CEST) 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 <0SF700K00TMDT400@imap.intranet.ufz.de>; Mon, 17 Jun 2024 10:35:22 +0200 (CEST) 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 <0SF700AIFUIY42E0@imap.intranet.ufz.de>; Mon, 17 Jun 2024 10:35:22 +0200 (CEST) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp1.ufz.de (smtp1-UFZ) with ESMTPSA id 379338020A; Mon, 17 Jun 2024 10:35:22 +0200 (CEST) Date: Mon, 17 Jun 2024 10:34:52 +0200 From: Lars Bilke In-reply-to: Message-id: X-Mailer: git-send-email 2.44.0 References: 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.85 X-Migadu-Scanner: mx12.migadu.com X-Spam-Score: -4.85 X-Migadu-Queue-Id: 144AA13123 X-TUID: KzMF6Q18oM9a Change-Id: Ie520a92ffe6f8bdd2678470ee06f618d74349460 --- gnu/local.mk | 1 + gnu/packages/engineering.scm | 4 +- gnu/packages/patches/freecad-vtk-9.3.patch | 43 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/freecad-vtk-9.3.patch diff --git a/gnu/local.mk b/gnu/local.mk index 83b7402b09..2a5a54a265 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1242,6 +1242,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-vtk-9.3.patch \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freeimage-libtiff-compat.patch \ %D%/packages/patches/freeimage-unbundle.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index e518d24fa2..fcb73eab12 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2783,7 +2783,9 @@ (define-public freecad (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0s720q6vxlh78jzahqp69nl8wagb42l05dym5aqhfnr31dx666hc")))) + (base32 "0s720q6vxlh78jzahqp69nl8wagb42l05dym5aqhfnr31dx666hc")) + ;; https://github.com/FreeCAD/FreeCAD/pull/11496 + (patches (search-patches "freecad-vtk-9.3.patch")))) (build-system qt-build-system) (native-inputs (list doxygen diff --git a/gnu/packages/patches/freecad-vtk-9.3.patch b/gnu/packages/patches/freecad-vtk-9.3.patch new file mode 100644 index 0000000000..af9d654046 --- /dev/null +++ b/gnu/packages/patches/freecad-vtk-9.3.patch @@ -0,0 +1,43 @@ +From d0fb2b8b29fe0428d9dd8aa790b0d6e45c8a9516 Mon Sep 17 00:00:00 2001 +From: Adrian Insaurralde Avalos +Date: Wed, 22 Nov 2023 16:42:06 -0300 +Subject: [PATCH] 3rdPart/salomesmesh - fix for vtk 9.3 compatibility + +minimum required version is 7.1 +--- + src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx | 4 ---- + src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp | 5 +++++ + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx +index 7f89573efd0d..47a52fe585fe 100644 +--- 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 +diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp +index 7e3de0070a02..e9895d615717 100644 +--- 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(); \ No newline at end of file -- 2.44.0