From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id KEnmJR/NXWbARgAAqHPOHw:P1 (envelope-from ) for ; Mon, 03 Jun 2024 16:03:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id KEnmJR/NXWbARgAAqHPOHw (envelope-from ) for ; Mon, 03 Jun 2024 16:03:11 +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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1717423391; 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=aixVx/x9u3BaiawE23T2vplrUpgIrZARRgo+WzHUydw=; b=MYYpUXdHhCNLib60yNbt8diz3AMnOSVarnXGjNGfeGg6rS8JosNyHRw8+4mgu2Vc0GDuD3 C2eO+oKB6EeQolvMp8cDkIY3dnwHaK4aj5bEiWADisnIxtJAGV5FzHq4r/L2hOx1VWr7KM 1szyAULcRYhUGhVG0rIDKgM/UF1TgH3hH9FW3wlZeL3D/bQWzV8jm+RoNi3OuLwTLd/ko/ soDJPj6EHe93+jMB8CUYC/z3Y0sUARrYc30VE8Z/zp2dEs2g6deY/k5uxPxa7z5UWbAZV/ ND0qHhj/GqVLgWFwnpYxgwyN6EXx4YezjZZ1UpqWMw+IIL8KezyBjtRgOy2upQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1717423391; a=rsa-sha256; cv=none; b=hyg5dDeEZur2ilb6tXT+ISMFO6Fdaz+WP4inkns8q45bC5LGl71j1evdw2TIwJg+OYdVlU 5vDVHCzRnu+qv+iGJ+ViKXxwyqhUgK3HfmL+b17Mxi9xNE+sVh5zPd2sf2Bk7Iw3qLCMPl YD2Xw+yTO6vG9J9EppBBzs5QKfu7WufzjomtOzRSyunzWYXyy2xx+ibwBCw2HAwu0YIr8P Jyjaybn5DnpUDFkjW1qva0W65dn11yxalwr6dqKZJwp9kZ0fsxr3wGWtYFTsPAfmVj3E5t l/mP879H/1v1XVof6j/7Mho7evDbhVd+qBr8A1ZuWDMRAKCPRVaBO2bmMPdxsg== 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" 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 49B53C2F4 for ; Mon, 03 Jun 2024 16:03:11 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sE8Gy-0002ZP-UM; Mon, 03 Jun 2024 10:02:52 -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 1sE8Gw-0002Z0-8L for guix-patches@gnu.org; Mon, 03 Jun 2024 10:02:50 -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 1sE8Gv-0007lm-O9 for guix-patches@gnu.org; Mon, 03 Jun 2024 10:02:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sE8H8-00056j-D8 for guix-patches@gnu.org; Mon, 03 Jun 2024 10:03:02 -0400 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-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: -1.84 X-Spam-Score: -1.84 X-Migadu-Queue-Id: 49B53C2F4 X-Migadu-Scanner: mx11.migadu.com X-TUID: gc4nP5jXCn4A 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