From unknown Fri Aug 15 20:51:01 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#70323] [PATCH] gnu: vtk: Update to 9.3.0 Resent-From: Lars Bilke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Apr 2024 12:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70323 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70323@debbugs.gnu.org Cc: Lars Bilke X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171275204524681 (code B ref -1); Wed, 10 Apr 2024 12:28:03 +0000 Received: (at submit) by debbugs.gnu.org; 10 Apr 2024 12:27:25 +0000 Received: from localhost ([127.0.0.1]:52335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruX2x-0006Po-Mb for submit@debbugs.gnu.org; Wed, 10 Apr 2024 08:27:25 -0400 Received: from lists.gnu.org ([2001:470:142::17]:38196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruX2s-0006Np-6v for submit@debbugs.gnu.org; Wed, 10 Apr 2024 08:27:22 -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 1ruX2c-0002pB-0C for guix-patches@gnu.org; Wed, 10 Apr 2024 08:27:02 -0400 Received: from mailgate5.ufz.de ([141.65.7.212] helo=mailgate.ufz.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruX2Y-0005WY-Sa for guix-patches@gnu.org; Wed, 10 Apr 2024 08:27:01 -0400 Received: from imap.intranet.ufz.de (dcs1.intranet.ufz.de [141.65.125.135]) by mailgate.ufz.de (Mailgate5-UFZ) with ESMTP id EB6C01602B6 for ; Wed, 10 Apr 2024 14:26:45 +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 <0SBQ00J00770UC00@imap.intranet.ufz.de> for guix-patches@gnu.org; Wed, 10 Apr 2024 14:26:45 +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 <0SBQ00KS17WLW000@imap.intranet.ufz.de> for guix-patches@gnu.org; Wed, 10 Apr 2024 14:26:45 +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 BC16980217; Wed, 10 Apr 2024 14:26:45 +0200 (CEST) Date: Wed, 10 Apr 2024 14:26:18 +0200 From: Lars Bilke Message-id: X-Mailer: git-send-email 2.44.0 Received-SPF: pass client-ip=141.65.7.212; envelope-from=lars.bilke@ufz.de; helo=mailgate.ufz.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Change-Id: Iec44a8e8dcfcf188a872af99e5b6e8c9fda7b416 --- gnu/packages/image-processing.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 98a3d0396d..de026d1bc8 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -328,7 +328,7 @@ (define-public opencolorio (define-public vtk (package (name "vtk") - (version "9.2.2") + (version "9.3.0") (source (origin (method url-fetch) (uri (string-append "https://vtk.org/files/release/" @@ -336,7 +336,7 @@ (define-public vtk "/VTK-" version ".tar.gz")) (sha256 (base32 - "0x8h2bwxq2870067j7wqd0qym87pa3inkbri93zrdb0zwwmhlnqw")) + "1s8vd34nhrgnw1bf9zhfn062d53fwq3csjfwvm7lxcr5a8lvkizx")) (modules '((guix build utils))) (snippet '(begin @@ -407,6 +407,7 @@ (define-public vtk ;; Do not retain a reference to GCC. (substitute* (choose + "Common/Core/vtkBuild.h.in" ;dummy >=v9.3 "Common/Core/vtkConfigureDeprecated.h.in" ;v9.x "Common/Core/vtkConfigure.h.in") ;v7.x (("@CMAKE_CXX_COMPILER@") "c++"))))) base-commit: 75bad75367fcf2c289fae3b40dbcc850f92177be prerequisite-patch-id: a5dde500e72a24257ecf0f50b15a7298fde4ff57 -- 2.44.0 From unknown Fri Aug 15 20:51:01 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#70323] [PATCH] gnu: vtk: Update to 9.3.0 Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 May 2024 10:32: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: Lars Bilke Cc: 70323@debbugs.gnu.org Received: via spool by 70323-submit@debbugs.gnu.org id=B70323.171715151830693 (code B ref 70323); Fri, 31 May 2024 10:32:02 +0000 Received: (at 70323) by debbugs.gnu.org; 31 May 2024 10:31:58 +0000 Received: from localhost ([127.0.0.1]:53290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCzYD-0007yz-Cf for submit@debbugs.gnu.org; Fri, 31 May 2024 06:31:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCzY7-0007yj-JH for 70323@debbugs.gnu.org; Fri, 31 May 2024 06:31:55 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sCzXp-0002jU-A1; Fri, 31 May 2024 06:31:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=L0tzVHUT5IEridq6mb8gVOAh4wMxwcTXGycQzZzb03E=; b=EqSaLvqsxdMrPzjw5cZm PycLI+64X//1QGWjFKZwLzQ+xBexkUz5kkImnUylwemSKV+evoEABBaTMyCoF9ICYN/o6ERRyDasL zSRI+l0I0xktNWNRkJ9BvcGr393pikEwzYZjIpWTIG12YfXhQqvzWvtlxpSlGzTlvOXDzZ0aTWbO9 WVpo+pSmDuv2Nv/1hv/br+nrbgzTjqLKwyafC5wJZ+SfS0Tm2i01Hl46UPSDZ8eEF6D9elEOVznZ6 7LdSALp6f+MdUBOmykAEKGGV9vSqi6mjKl3OdxxnhvNA1MPUIJoIiLdqrTZXv07RVKas/Fvqvd7hr VZK6+0SPRIh2Fw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Lars Bilke's message of "Wed, 10 Apr 2024 14:26:18 +0200") References: Date: Fri, 31 May 2024 12:31:30 +0200 Message-ID: <8734pyuvb1.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Lars, Apparently this change breaks Freecad: --8<---------------cut here---------------start------------->8--- /tmp/guix-build-freecad-0.21.2.drv-0/source/src/3rdParty/salomesmesh/src/SM= DS/SMDS_UnstructuredGrid.cpp: In member func tion =E2=80=98void SMDS_UnstructuredGrid::BuildLinks()=E2=80=99: /tmp/guix-build-freecad-0.21.2.drv-0/source/src/3rdParty/salomesmesh/src/SM= DS/SMDS_UnstructuredGrid.cpp:1029:25: error: no matching function for call to =E2=80=98vtkCellLinks::BuildLinks(SMDS_Un= structuredGrid*)=E2=80=99 1029 | GetLinks()->BuildLinks(this); | ~~~~~~~~~~~~~~~~~~~~~~^~~~~~ In file included from /tmp/guix-build-freecad-0.21.2.drv-0/source/src/3rdPa= rty/salomesmesh/inc/SMDS_UnstructuredGrid.hx x:30, from /tmp/guix-build-freecad-0.21.2.drv-0/source/src/3rdPa= rty/salomesmesh/src/SMDS/SMDS_UnstructuredGr id.cpp:20: /gnu/store/r3zpn5wmn98rllifyqq4h4wkp46zq0j2-vtk-9.3.0/include/vtk-9.3/vtkCe= llLinks.h:56:8: note: candidate: =E2=80=98virtual vo id vtkCellLinks::BuildLinks()=E2=80=99 56 | void BuildLinks() override; | ^~~~~~~~~~ /gnu/store/r3zpn5wmn98rllifyqq4h4wkp46zq0j2-vtk-9.3.0/include/vtk-9.3/vtkCe= llLinks.h:56:8: note: candidate expects 0=20 arguments, 1 provided --8<---------------cut here---------------end--------------->8--- I haven=E2=80=99t checked the other dependents returned by =E2=80=98guix re= fresh -l vtk@9=E2=80=99, but we should (for some reason hasn=E2=80=99t caught up). Could you take a look? Thanks, Ludo=E2=80=99. From unknown Fri Aug 15 20:51:01 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#70323] [PATCH v2] gnu: vtk: Update to 9.3.0 References: In-Reply-To: Resent-From: Lars Bilke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jun 2024 14:03: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: Lars Bilke Received: via spool by 70323-submit@debbugs.gnu.org id=B70323.171742333519579 (code B ref 70323); Mon, 03 Jun 2024 14:03:02 +0000 Received: (at 70323) by debbugs.gnu.org; 3 Jun 2024 14:02:15 +0000 Received: from localhost ([127.0.0.1]:42133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE8GN-00055i-3B for submit@debbugs.gnu.org; Mon, 03 Jun 2024 10:02:15 -0400 Received: from mailgate5.ufz.de ([141.65.7.212]:58322 helo=mailgate.ufz.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE8GH-00055Q-L1 for 70323@debbugs.gnu.org; Mon, 03 Jun 2024 10:02:13 -0400 Received: from imap.intranet.ufz.de (dcs1.intranet.ufz.de [141.65.125.135]) by mailgate.ufz.de (Mailgate5-UFZ) with ESMTP id 717DF1602C7 for <70323@debbugs.gnu.org>; Mon, 3 Jun 2024 16:01:50 +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 <0SEI00100C8EVI00@imap.intranet.ufz.de> for 70323@debbugs.gnu.org; Mon, 03 Jun 2024 16:01:50 +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 <0SEI00K8ECB296B0@imap.intranet.ufz.de> for 70323@debbugs.gnu.org; Mon, 03 Jun 2024 16:01:50 +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 429B98020B; Mon, 3 Jun 2024 16:01:50 +0200 (CEST) Date: Mon, 03 Jun 2024 16:01:41 +0200 From: Lars Bilke Message-id: X-Mailer: git-send-email 2.44.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Change-Id: Iec44a8e8dcfcf188a872af99e5b6e8c9fda7b416 --- gnu/packages/engineering.scm | 4 +- gnu/packages/image-processing.scm | 5 ++- gnu/packages/patches/freecad-vtk-9.3.patch | 43 ++++++++++++++++++++++ 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/freecad-vtk-9.3.patch diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 624024b8d4..cfcd3f8da7 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2806,7 +2806,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/image-processing.scm b/gnu/packages/image-processing.scm index 7c9d12557e..65fe793f2d 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -309,7 +309,7 @@ (define-public opencolorio (define-public vtk (package (name "vtk") - (version "9.2.2") + (version "9.3.0") (source (origin (method url-fetch) (uri (string-append "https://vtk.org/files/release/" @@ -317,7 +317,7 @@ (define-public vtk "/VTK-" version ".tar.gz")) (sha256 (base32 - "0x8h2bwxq2870067j7wqd0qym87pa3inkbri93zrdb0zwwmhlnqw")) + "1s8vd34nhrgnw1bf9zhfn062d53fwq3csjfwvm7lxcr5a8lvkizx")) (modules '((guix build utils))) (snippet '(begin @@ -388,6 +388,7 @@ (define-public vtk ;; Do not retain a reference to GCC. (substitute* (choose + "Common/Core/vtkBuild.h.in" ;dummy >=v9.3 "Common/Core/vtkConfigureDeprecated.h.in" ;v9.x "Common/Core/vtkConfigure.h.in") ;v7.x (("@CMAKE_CXX_COMPILER@") "c++"))))) 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 base-commit: 2dfe45e12ed55e5f9bf3d4061200bc607e2e5db8 -- 2.44.0 From unknown Fri Aug 15 20:51:01 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#70323] [PATCH] gnu: vtk: Update to 9.3.0 References: In-Reply-To: Resent-From: Lars Bilke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jun 2024 06:31:01 +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 Received: via spool by 70323-submit@debbugs.gnu.org id=B70323.171748260319033 (code B ref 70323); Tue, 04 Jun 2024 06:31:01 +0000 Received: (at 70323) by debbugs.gnu.org; 4 Jun 2024 06:30:03 +0000 Received: from localhost ([127.0.0.1]:56195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sENgI-0004vl-QX for submit@debbugs.gnu.org; Tue, 04 Jun 2024 02:30:03 -0400 Received: from mailgate4.ufz.de ([141.65.7.211]:46008 helo=mailgate.ufz.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sENgG-0004v3-6D for 70323@debbugs.gnu.org; Tue, 04 Jun 2024 02:30:02 -0400 Received: from imap.intranet.ufz.de (dcs1.intranet.ufz.de [141.65.125.135]) by mailgate.ufz.de (Mailgate4-UFZ) with ESMTP id 935361602D4 for <70323@debbugs.gnu.org>; Tue, 4 Jun 2024 08:29:40 +0200 (CEST) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; markup=markdown 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 <0SEJ00900M1CKK00@imap.intranet.ufz.de> for 70323@debbugs.gnu.org; Tue, 04 Jun 2024 08:29:40 +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 <0SEJ00J9ZM1GBJF0@imap.intranet.ufz.de> for 70323@debbugs.gnu.org; Tue, 04 Jun 2024 08:29:40 +0200 (CEST) Received: from [141.65.54.219] (unknown [141.65.54.219]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp1.ufz.de (smtp1-UFZ) with ESMTPSA id 6D68A8001C for <70323@debbugs.gnu.org>; Tue, 4 Jun 2024 08:29:40 +0200 (CEST) Date: Tue, 04 Jun 2024 08:29:40 +0200 From: Lars Bilke Message-id: <15D059AA-DF6C-472F-A176-14AFAD9BD454@ufz.de> X-Mailer: MailMate (1.14r5937) X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I have added a patch for FreeCAD and also tested some dependant packages such as pyvista, openfoam, f3d and siril. From unknown Fri Aug 15 20:51:01 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#70323] Further work References: In-Reply-To: Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Jun 2024 11:41:01 +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 Received: via spool by 70323-submit@debbugs.gnu.org id=B70323.171801964127911 (code B ref 70323); Mon, 10 Jun 2024 11:41:01 +0000 Received: (at 70323) by debbugs.gnu.org; 10 Jun 2024 11:40:41 +0000 Received: from localhost ([127.0.0.1]:56577 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sGdOC-0007G1-4Q for submit@debbugs.gnu.org; Mon, 10 Jun 2024 07:40:40 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:53230) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sGdB6-0003sG-AH for 70323@debbugs.gnu.org; Mon, 10 Jun 2024 07:27:09 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 84666D4E; Mon, 10 Jun 2024 13:09:19 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MhTWgphoRc17; Mon, 10 Jun 2024 13:09:19 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id D082C259; Mon, 10 Jun 2024 13:09:18 +0200 (CEST) Date: Mon, 10 Jun 2024 13:09:17 +0200 From: Andreas Enge Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Lars, everything works well according to QA. However, could you split the commit into two, one updating vtk; and the second one applying the patch to freecad, and also mentioning the file in the commit message and registering it in gnu/local.mk? Thanks, Andreas From unknown Fri Aug 15 20:51:01 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#70323] [PATCH v3 1/2] gnu: vtk: Update to 9.3.0 References: In-Reply-To: Resent-From: Lars Bilke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Jun 2024 08:36:01 +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.171861332411693 (code B ref 70323); Mon, 17 Jun 2024 08:36:01 +0000 Received: (at 70323) by debbugs.gnu.org; 17 Jun 2024 08:35:24 +0000 Received: from localhost ([127.0.0.1]:59536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJ7pj-00032X-Qk for submit@debbugs.gnu.org; Mon, 17 Jun 2024 04:35:24 -0400 Received: from mailgate5.ufz.de ([141.65.7.212]:60998 helo=mailgate.ufz.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJ7ph-000328-FW for 70323@debbugs.gnu.org; Mon, 17 Jun 2024 04:35:22 -0400 Received: from imap.intranet.ufz.de (dcs1.intranet.ufz.de [141.65.125.135]) by mailgate.ufz.de (Mailgate5-UFZ) with ESMTP id B043D1602C2; Mon, 17 Jun 2024 10:35:12 +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:12 +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 <0SF700AI1UIN42E0@imap.intranet.ufz.de>; Mon, 17 Jun 2024 10:35:12 +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 D8D4F8020B; Mon, 17 Jun 2024 10:35:11 +0200 (CEST) Date: Mon, 17 Jun 2024 10:34:51 +0200 From: Lars Bilke Message-id: X-Mailer: git-send-email 2.44.0 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Change-Id: Id31d41e7dc457d1f17c0e8e824c170942d81698c --- gnu/packages/image-processing.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 7c9d12557e..65fe793f2d 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -309,7 +309,7 @@ (define-public opencolorio (define-public vtk (package (name "vtk") - (version "9.2.2") + (version "9.3.0") (source (origin (method url-fetch) (uri (string-append "https://vtk.org/files/release/" @@ -317,7 +317,7 @@ (define-public vtk "/VTK-" version ".tar.gz")) (sha256 (base32 - "0x8h2bwxq2870067j7wqd0qym87pa3inkbri93zrdb0zwwmhlnqw")) + "1s8vd34nhrgnw1bf9zhfn062d53fwq3csjfwvm7lxcr5a8lvkizx")) (modules '((guix build utils))) (snippet '(begin @@ -388,6 +388,7 @@ (define-public vtk ;; Do not retain a reference to GCC. (substitute* (choose + "Common/Core/vtkBuild.h.in" ;dummy >=v9.3 "Common/Core/vtkConfigureDeprecated.h.in" ;v9.x "Common/Core/vtkConfigure.h.in") ;v7.x (("@CMAKE_CXX_COMPILER@") "c++"))))) base-commit: bd5c61781c13611ed16686513980907c6ee34ae6 -- 2.44.0 From unknown Fri Aug 15 20:51:01 2025 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-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Fri Aug 15 20:51:01 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Lars Bilke Subject: bug#70323: closed (Re: [PATCH v3 1/2] gnu: vtk: Update to 9.3.0) Message-ID: References: X-Gnu-PR-Message: they-closed 70323 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 70323@debbugs.gnu.org Date: Thu, 27 Jun 2024 17:18:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1719508682-28782-1" This is a multi-part message in MIME format... ------------=_1719508682-28782-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #70323: [PATCH] gnu: vtk: Update to 9.3.0 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 70323@debbugs.gnu.org. --=20 70323: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D70323 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1719508682-28782-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 70323-done) by debbugs.gnu.org; 27 Jun 2024 17:17:57 +0000 Received: from localhost ([127.0.0.1]:43292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMsku-0007Tx-PS for submit@debbugs.gnu.org; Thu, 27 Jun 2024 13:17:56 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:35200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMsks-0007Tj-Re for 70323-done@debbugs.gnu.org; Thu, 27 Jun 2024 13:17:55 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 92F40D84; Thu, 27 Jun 2024 19:17:15 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YEfIkrH5qUKR; Thu, 27 Jun 2024 19:17:14 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 46FC5778; Thu, 27 Jun 2024 19:17:14 +0200 (CEST) Date: Thu, 27 Jun 2024 19:17:12 +0200 From: Andreas Enge To: Lars Bilke Subject: Re: [PATCH v3 1/2] gnu: vtk: Update to 9.3.0 Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70323-done Cc: 70323-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, I just realised that the patches already built on QA when they were put together as one; so there is no real point to wait for QA again. I have checked that freecad still builds on x86_64 and pushed the two patches. Thanks! Andreas ------------=_1719508682-28782-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 10 Apr 2024 12:27:25 +0000 Received: from localhost ([127.0.0.1]:52335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruX2x-0006Po-Mb for submit@debbugs.gnu.org; Wed, 10 Apr 2024 08:27:25 -0400 Received: from lists.gnu.org ([2001:470:142::17]:38196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruX2s-0006Np-6v for submit@debbugs.gnu.org; Wed, 10 Apr 2024 08:27:22 -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 1ruX2c-0002pB-0C for guix-patches@gnu.org; Wed, 10 Apr 2024 08:27:02 -0400 Received: from mailgate5.ufz.de ([141.65.7.212] helo=mailgate.ufz.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruX2Y-0005WY-Sa for guix-patches@gnu.org; Wed, 10 Apr 2024 08:27:01 -0400 Received: from imap.intranet.ufz.de (dcs1.intranet.ufz.de [141.65.125.135]) by mailgate.ufz.de (Mailgate5-UFZ) with ESMTP id EB6C01602B6 for ; Wed, 10 Apr 2024 14:26:45 +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 <0SBQ00J00770UC00@imap.intranet.ufz.de> for guix-patches@gnu.org; Wed, 10 Apr 2024 14:26:45 +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 <0SBQ00KS17WLW000@imap.intranet.ufz.de> for guix-patches@gnu.org; Wed, 10 Apr 2024 14:26:45 +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 BC16980217; Wed, 10 Apr 2024 14:26:45 +0200 (CEST) Date: Wed, 10 Apr 2024 14:26:18 +0200 From: Lars Bilke Subject: [PATCH] gnu: vtk: Update to 9.3.0 To: guix-patches@gnu.org Message-id: X-Mailer: git-send-email 2.44.0 Received-SPF: pass client-ip=141.65.7.212; envelope-from=lars.bilke@ufz.de; helo=mailgate.ufz.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit Cc: Lars Bilke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Change-Id: Iec44a8e8dcfcf188a872af99e5b6e8c9fda7b416 --- gnu/packages/image-processing.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 98a3d0396d..de026d1bc8 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -328,7 +328,7 @@ (define-public opencolorio (define-public vtk (package (name "vtk") - (version "9.2.2") + (version "9.3.0") (source (origin (method url-fetch) (uri (string-append "https://vtk.org/files/release/" @@ -336,7 +336,7 @@ (define-public vtk "/VTK-" version ".tar.gz")) (sha256 (base32 - "0x8h2bwxq2870067j7wqd0qym87pa3inkbri93zrdb0zwwmhlnqw")) + "1s8vd34nhrgnw1bf9zhfn062d53fwq3csjfwvm7lxcr5a8lvkizx")) (modules '((guix build utils))) (snippet '(begin @@ -407,6 +407,7 @@ (define-public vtk ;; Do not retain a reference to GCC. (substitute* (choose + "Common/Core/vtkBuild.h.in" ;dummy >=v9.3 "Common/Core/vtkConfigureDeprecated.h.in" ;v9.x "Common/Core/vtkConfigure.h.in") ;v7.x (("@CMAKE_CXX_COMPILER@") "c++"))))) base-commit: 75bad75367fcf2c289fae3b40dbcc850f92177be prerequisite-patch-id: a5dde500e72a24257ecf0f50b15a7298fde4ff57 -- 2.44.0 ------------=_1719508682-28782-1--