From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iBRKBfPzRGcbQgEAqHPOHw:P1 (envelope-from ) for ; Mon, 25 Nov 2024 22:02:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id iBRKBfPzRGcbQgEAqHPOHw (envelope-from ) for ; Mon, 25 Nov 2024 23:02:27 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=mjtE3Dgu; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=MBBNvJtb; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=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=1732572146; a=rsa-sha256; cv=none; b=Gm9aSWABFfReC3lvb71yIoFy8bsrSGXLV8vZh+UDXR5EfBkXg6HrPO58YE70GiCR8cLUiS IyKz6nk2504+AD0UDQ2IX50xkvBSIeDxej/QSBmst/F6tcggltb/YDpwrLnATuDuDKlBTf vsxVKXDOcix0ktm5WwC5d4y37onHnwYaD50Vv6YuZleIXaxPLXhQ8xP3K0fOopU/IaYn1g +3o07+mgsAAMnw2xXaak04rXM+J78xU8PWsc2tSaPtp3/TgoKdpmAc4Jx0Sqrvq7PgvhLn axRVa3c7kT4x5JhsPhIsuy8Q4XdSu1DhXUydw9IOa2guDqJMcC9jcPln/epHyg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=mjtE3Dgu; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=MBBNvJtb; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=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=1732572146; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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:dkim-signature; bh=+xqBwL6pKikcPBpd2PgaWDylY7IVUupoR0SZMIgJyjM=; b=iVfJTmF6moC1ZXW7GPhHo0dByLfY406jnLcytAb7BGB0Va6Sd6KPFiE3NbiCytVDA/tfk5 can6eKRj4FglPM5j6tsQgOuqVb8VlMGOaRsVtPOu9+RSrnI8414JHxSurvbJzu6rbOCcj7 pePbZkOgJvIWNy5J229elVabxBnTDxKeTmIaQovx8xk0rwkvBVrKcpKR8zL0F/gREQamAH +ZFf2lYpSQzUL29a/+KyWrM0qoYFkNPETNnQYRbXxJzVRaI7nNOo9TcU0l60OrcNbRv4ey Bm6Y7EIBELjihaZjb1jR0IVSSyhPexrTSpv/V7rK4rtNl088mpstnGm3d68a9w== 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 D442A815B9 for ; Mon, 25 Nov 2024 23:02:25 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tFh9g-0006JC-UB; Mon, 25 Nov 2024 17:02: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 1tFh9f-0006Ia-36 for guix-patches@gnu.org; Mon, 25 Nov 2024 17:02: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 1tFh9e-0006tk-R5 for guix-patches@gnu.org; Mon, 25 Nov 2024 17:02:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=+xqBwL6pKikcPBpd2PgaWDylY7IVUupoR0SZMIgJyjM=; b=mjtE3DguGDMpLLSpIvYPz7Q3rIPU4Rmp1r3NreTItfVFx/7/fI3d94QF6AaGuFH+49EIbE0x1Bh9PbdvG/JNEDnXTiwaxR5YhXUENP9dyf2q0oiaOK4HB5V3j5uLqFD+Bple7Cbf9OoOElc8icsIMxI2q5arln0ugpXMTAIQfDAFJjIQXy1OoOIUNc5qywY0rBml5G8BJ6+YA3Ia55/0jLRL9m4Z18B3oN56bLzkD7+S+ia+pwLNRJzXMnU2m/zomM24GAzZw1WV3fm+2FJP2UwLa/UWLLaXTJ3J56ZdaKoie/LT7NEv7JTtT1iVEP5x5cMlwKTiRBZyRUjVj/7ExA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tFh9e-0007SW-Lw for guix-patches@gnu.org; Mon, 25 Nov 2024 17:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74538] [PATCH 2/2] gnu: freecad: Update to 1.0.0. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Nov 2024 22:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74538 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74538@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 74538-submit@debbugs.gnu.org id=B74538.173257209628616 (code B ref 74538); Mon, 25 Nov 2024 22:02:02 +0000 Received: (at 74538) by debbugs.gnu.org; 25 Nov 2024 22:01:36 +0000 Received: from localhost ([127.0.0.1]:42141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFh9D-0007RT-Jm for submit@debbugs.gnu.org; Mon, 25 Nov 2024 17:01:36 -0500 Received: from mail-wm1-f52.google.com ([209.85.128.52]:44478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFh9B-0007R3-Lq for 74538@debbugs.gnu.org; Mon, 25 Nov 2024 17:01:34 -0500 Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-434a10588f3so9573135e9.1 for <74538@debbugs.gnu.org>; Mon, 25 Nov 2024 14:01:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732572028; x=1733176828; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+xqBwL6pKikcPBpd2PgaWDylY7IVUupoR0SZMIgJyjM=; b=MBBNvJtbYz7VREVP2uZYvqdVAK3faRF4JRZyj+oog+s2nFiO8+vchApLBGpS8okRBw Tyhx4le0PT8HklXwcv4SlpUSmZjOamrqP1+8FVIJWNobhgUamhp1PUFFDR1/15c6t9H4 6jJGGd6NrTvcJ9d5rCjGNWzdcQQoqLMMwBZ6ihRpojKi0W6dH1yuZPwY+DpjVOI2iL0U gG2n2vzakJK8ysFbviIJ+MTpstvGf3HP1yaMF9/ssM3poE1iAjZTmwH7mzsVAAP1+66y v1hvV3kTsmai1qkBuqwyNTkTVaA7tz4fu3QGkATSa8+6K8wQTMau9JUOVZpVJDw8qXG/ p35g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732572028; x=1733176828; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+xqBwL6pKikcPBpd2PgaWDylY7IVUupoR0SZMIgJyjM=; b=FJPOwL+opp0O082qtZdR/joQY13vUN2TTeVzrp9ccTn3vJKTny6lxMsk6lV2hPQB+5 m/VDaNn56JRYuYc4TaCQoWIB1ZvR3Mt3AsjkVCOeJZp3/fINXYz5iieRj2DI0FXvCnQK qE/poVQBI66oNXswVDXywIKAbbB/wFixj/4LoyOCOpeGMd6pb/gLgsc0MPFjh0k2zXqb oTCIRc9/SkTEUQmCVl4LcjYxSFJ5bhMzfLwSCWrMaZfRozu2wowncuZ2ZdLOL86rvVom cXHBB3PI7aRuCIh9fQq0YelbcX1yfx9cR0FLH+YERS8xyMrEPhJHahpQpTEFrM1NRdCz +9FQ== X-Gm-Message-State: AOJu0Yxnc7SE6rN9sUb/P3eeZkkN191+H3nr99ImwZEuQZj8iy3ddNxR Y3BUT7BgLXIFMkqCdDtt+HaIWX1O0f1iOELYy21g+cEzew1X1clmalC3CA== X-Gm-Gg: ASbGncv6F2r/fv3mrMUQ4+jaAZXRkKPqEbvATE3S2WWG8Hwi+AixY7SJWrEXXRNiznn vR5Ylff3AVRRQvRoUTXBm2q17wpy02cwgX3tXOBuq4TzKR3zRRxmg43W7gZCtVXFjjO49P1RM8d hCu0bjusBbigZZ6e61qJNiERlnoTCOpxuBm9YYF/lrjo2yfmjLxOQPqcWt/ZxYWMt37prnpvpWi JZBBcE/iKLiKUM6Iw/xwWgTfijfSX6t2LPXrRFbS76jm7lhtdnFxfQwcdL04VMbBT/kKI21RdKO CCLk X-Google-Smtp-Source: AGHT+IG7g0M1WJUsXNlzWR9DNh2bRkOfCUzHrBGf8/NyRtszZc/RbhJfKY+9D9leU6+dAl6BiHfELw== X-Received: by 2002:a7b:cb52:0:b0:431:6153:a258 with SMTP id 5b1f17b1804b1-43487435826mr126425285e9.13.1732572027693; Mon, 25 Nov 2024 14:00:27 -0800 (PST) Received: from ryzen.lan (82-65-243-93.subs.proxad.net. [82.65.243.93]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-433cde10eabsm143239765e9.13.2024.11.25.14.00.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2024 14:00:26 -0800 (PST) From: Vincent Legoll Date: Mon, 25 Nov 2024 23:00:14 +0100 Message-ID: <20241125220016.8338-2-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241125220016.8338-1-vincent.legoll@gmail.com> References: <20241125220016.8338-1-vincent.legoll@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.91 X-Spam-Score: -3.91 X-Migadu-Queue-Id: D442A815B9 X-Migadu-Scanner: mx10.migadu.com X-TUID: +fXf+F3WskVs * gnu/packages/patches/freecad-vtk-9.3.patch: Has been upstreamed, remove. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/engineering (freecad)[source]: Update to 1.0.0, remove patches, add snippet to unbundle some 3rdparty code. [native-inputs]: Add c++-gsl. [inputs]: Add onsdel-solver, yaml-cpp. [configure-flags]: Add some flags. Change-Id: I3005a3b5cccc8aae4129a49e123fd5ab8293b3f2 Signed-off-by: Vincent Legoll --- gnu/local.mk | 1 - gnu/packages/engineering.scm | 25 ++++++++++--- gnu/packages/patches/freecad-vtk-9.3.patch | 43 ---------------------- 3 files changed, 19 insertions(+), 50 deletions(-) delete mode 100644 gnu/packages/patches/freecad-vtk-9.3.patch diff --git a/gnu/local.mk b/gnu/local.mk index 04e9b1c0fd..c89fd88282 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1284,7 +1284,6 @@ 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-libraw-0.21-compat.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5178043a52..125f8fdfea 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2956,7 +2956,7 @@ (define-public ondsel-solver (define-public freecad (package (name "freecad") - (version "0.21.2") + (version "1.0.0") (source (origin (method git-fetch) @@ -2965,12 +2965,19 @@ (define-public freecad (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0s720q6vxlh78jzahqp69nl8wagb42l05dym5aqhfnr31dx666hc")) - ;; https://github.com/FreeCAD/FreeCAD/pull/11496 - (patches (search-patches "freecad-vtk-9.3.patch")))) + (base32 "0wwymcfgi0cybj7m6awflk8c7n6iy97lpgpfhfncx3zwvjrxv588")) + (modules '((guix build utils))) + (snippet + '(begin + ;; not required, because 3D mouse support if OFF + (delete-file-recursively "src/3rdParty/3Dconnexion") + (delete-file-recursively "src/3rdParty/GSL") ;; c++-gsl + (delete-file-recursively "src/3rdParty/OndselSolver") ;; ondsel-solver + (delete-file-recursively "src/3rdParty/OpenGL"))))) ;; glext.h from mesa (build-system qt-build-system) (native-inputs - (list doxygen + (list c++-gsl + doxygen graphviz qttools-5 pkg-config @@ -3000,6 +3007,7 @@ (define-public freecad libxmu lz4 netcdf + ondsel-solver opencascade-occt openmpi proj @@ -3022,14 +3030,19 @@ (define-public freecad tbb-2020 ; Same version as opencascade-occt vtk xerces-c + yaml-cpp zlib)) (arguments - `(#:tests? #f ; Project has no tests + `(#:tests? #f ;; Project has tests, but they are a pain to build #:configure-flags ,#~(list "-DBUILD_QT5=ON" "-DBUILD_FLAT_MESH:BOOL=ON" "-DBUILD_ENABLE_CXX_STD:STRING=C++17" + "-DENABLE_DEVELOPER_TESTS=OFF" ;; see the above: #:tests? comment + "-DFREECAD_USE_EXTERNAL_ONDSELSOLVER=ON" ;; unbundle ondsel-solver + ;; Do not try to install modules into system python + "-DINSTALL_TO_SITEPACKAGES=OFF" (string-append "-DCMAKE_INSTALL_LIBDIR=" #$output "/lib")) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/freecad-vtk-9.3.patch b/gnu/packages/patches/freecad-vtk-9.3.patch deleted file mode 100644 index af9d654046..0000000000 --- a/gnu/packages/patches/freecad-vtk-9.3.patch +++ /dev/null @@ -1,43 +0,0 @@ -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.46.0