From patchwork Wed Apr 30 00:15:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: nomike X-Patchwork-Id: 42167 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 1D7F927BC4D; Wed, 30 Apr 2025 01:16:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 2D27327BC49 for ; Wed, 30 Apr 2025 01:16:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9v7d-0008VK-3H; Tue, 29 Apr 2025 20:16:21 -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 1u9v7L-0008QC-UH for guix-patches@gnu.org; Tue, 29 Apr 2025 20:16:05 -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 1u9v7L-0000sm-Kn for guix-patches@gnu.org; Tue, 29 Apr 2025 20:16:03 -0400 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=4ZX35F1rrL9Wg4INigrNf2EtkdibM1wPso6zjputKZ0=; b=NtEYSMS3SXrAPvetLBqEfW8Sbvf0qXdmSsi6twRkBmzlPpBTQrFsjHGQ+vMRey9T0CYuaUrOx2SxMjlM6ntC3MIbEiFmZVY5FKuvFa4rh19EUN0ooaXP8MsGENpseEwHYykDRfEfzqcjCSpd6GutdOcQz7anoIr8ILkxeFHLeoc0XI6tEorcQ1ZVD85eoib3WMquHZHtC0os0Huh67tl8H1q2ckjSDqtTyAZiBGIuA0edzMEz47tsVEJDE+r11oGDVyTwc16u4sZOEyooYjnjXpfxcW4UWfwHF6KK/D5sNczDM1JX6KwLiFV7r/kwEzWSwfKpz7g6vGIsXAUgDuyhw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9v7L-0007Mc-Ei for guix-patches@gnu.org; Tue, 29 Apr 2025 20:16:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78154] [PATCH 2/5] gnu: Add version 7.6.1 of opencascade-occt Resent-From: nomike Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Apr 2025 00:16:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78154 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78154@debbugs.gnu.org Cc: nomike Received: via spool by 78154-submit@debbugs.gnu.org id=B78154.174597215428252 (code B ref 78154); Wed, 30 Apr 2025 00:16:03 +0000 Received: (at 78154) by debbugs.gnu.org; 30 Apr 2025 00:15:54 +0000 Received: from localhost ([127.0.0.1]:37492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9v7B-0007Lb-9K for submit@debbugs.gnu.org; Tue, 29 Apr 2025 20:15:53 -0400 Received: from beige.banana.relay.mailchannels.net ([23.83.217.16]:64517) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u9v78-0007LO-3f for 78154@debbugs.gnu.org; Tue, 29 Apr 2025 20:15:51 -0400 X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id C77A284449E; Wed, 30 Apr 2025 00:15:48 +0000 (UTC) Received: from pdx1-sub0-mail-a217.dreamhost.com (trex-4.trex.outbound.svc.cluster.local [100.113.14.132]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 7780F843FD2; Wed, 30 Apr 2025 00:15:48 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1745972148; a=rsa-sha256; cv=none; b=uDw2/5MRuhcryIZ4LufDmP2WTGTH04N9fWsPYdO0TujBlu5TNlFzoaXHveh0F7peShURhp EFr279OvDd0CroPzTCr28D/TqremMKDakP3ONTkVkgunESnlxiX048OkIu2JwtpUEpDuoc kswbglKfkjCbgp7oaPrFtW3wdFQ15XQV4LUIjYPdJO/bCT1aGw/qZGZ3kG3wNKFwjoNvQu klSDlj3FV0uaRk31lMz6VvVCRRGZ6LR51+WXyoeAaixuoI+u4oLXu1F3ydh0QeSPXcfQ0Z fDWHqwExqiyKABy0e3xKZDW6PSgrMLOl/GFQZoTTSWJvaB0/FuECtOnbDaULkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1745972148; h=from:from: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4ZX35F1rrL9Wg4INigrNf2EtkdibM1wPso6zjputKZ0=; b=mExYqB780/2oQRhuAa6JBsTmZQIC5eokaL/KjAkjCvjxxqtRBc5BaOmeizkQCXCbvdfGQi sqkcHgrwdh7T9PzbjLkLahinLdXnLLsgM22HHg5ITabGkOqknRKmJ9egqnuAJLRs+tvhBz lbyEswk5TZ0sTw2Y+czbh3Cra1SXNlOnFqsfEy9LgX9zN9ygpGhvjswFnsHTWtACNS/0SR Pnt/w08yI7ACutFMCtep24NMaY68L/nSzaDnB36A3h8WYBStQ2rcAhbWuIDZAvr7DUuZ0h wVTj9KvsOTU2+fgJtuIqzQF9QOLA9iWqhaWV4DT12pZ2M/1AghnZC4Q6XUZTlw== ARC-Authentication-Results: i=1; rspamd-684646cf5b-zx482; auth=pass smtp.auth=dreamhost smtp.mailfrom=nomike@nomike.com X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com X-MC-Relay: Bad X-MailChannels-SenderId: dreamhost|x-authsender|nomike@nomike.com X-MailChannels-Auth-Id: dreamhost X-Invention-Sponge: 722dc2e62b425554_1745972148711_3422471031 X-MC-Loop-Signature: 1745972148711:4031831773 X-MC-Ingress-Time: 1745972148711 Received: from pdx1-sub0-mail-a217.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.113.14.132 (trex/7.0.3); Wed, 30 Apr 2025 00:15:48 +0000 Received: from localhost (84-112-221-106.cable.dynamic.surfer.at [84.112.221.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nomike@nomike.com) by pdx1-sub0-mail-a217.dreamhost.com (Postfix) with ESMTPSA id 4ZnHlR42zRz65; Tue, 29 Apr 2025 17:15:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1745972148; bh=4ZX35F1rrL9Wg4INigrNf2EtkdibM1wPso6zjputKZ0=; h=From:To:Cc:Subject:Date:Content-Type:Content-Transfer-Encoding; b=cTfLM5t7oRinCIFEAYZieVt0KFI2WtsbY8/U0ohAvm08GoTyUUdUTThMDO/WzJFPK zjiNBSq0eL1wJapMZ7K3X9C7G6cDQ7bdbQaO/sxiV2UX7SWl6hXl04GxbHj4WjwNl/ PUXnItFOuggqF5rm77P+3RpjNpCDhZSGyK3Vr5qdzOGzM8rQhV1QCVrC6iRFveHR16 6zTAOsenWpGy37dBvxX0KgeYEC7Pl48+QgJP1maYTd+CJ/Ww/x8PEfRKX2wZtWEqvm RxZIRElY8n/82uzP0Xxu2ShEBTLmwUUGqBsnQ4YmOwrnFB8ruPqgpWrR+bhy6+7KIX YEdsGuBdmNjNA== From: nomike Date: Wed, 30 Apr 2025 02:15:04 +0200 Message-ID: <20250430001507.912670-2-nomike@nomike.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250430001507.912670-1-nomike@nomike.com> References: <20250430001507.912670-1-nomike@nomike.com> MIME-Version: 1.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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (opencascade-occt-7.6.1): New variable Change-Id: I4ade08f8e9db19c4aea115ab838ed163661ab3d4 --- gnu/packages/maths.scm | 98 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0b653f4daf..face2f6da3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -69,6 +69,7 @@ ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2025 Luca Cirrottola ;;; Copyright © 2025 Maxim Cournoyer +;;; Copyright © 2025 nomike Postmann ;;; ;;; This file is part of GNU Guix. ;;; @@ -3305,6 +3306,103 @@ (define-public octave #t)))))) (synopsis "High-level language for numerical computation (with GUI)"))) +(define-public opencascade-occt-7.6.1 + ;; As of version 2.9.2 PrusaSlicer has a hard dependency on this version of OCCT + ;; "because newer versions are triangulating chamfers incorrectly.". + ;; See https://github.com/prusa3d/PrusaSlicer/commit/c6a02106fd1d3caa9a48a6b7c2bdd04546b24485 + (package + (name "opencascade-occt") + (version "7.6.1") + (properties '((release-tag-prefix . "^V") + (release-tag-version-delimiter . "_"))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.dev.opencascade.org/repos/occt.git") + (commit (string-append "V" + (string-map (lambda (x) + (if (eq? x #\.) #\_ x)) + version))))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cc7n4rs26lm1awwn2bijvjq9b3kz204ffnks02lrpgs7pf8yk8b")) + (modules '((guix build utils))) + (snippet '(begin + ;; Remove files specific to non-free operating systems. + (delete-file-recursively "samples/ios") + (delete-file-recursively "samples/mfc") + (delete-file-recursively "samples/qt/FuncDemo") + (delete-file "genconf.bat") + (delete-file "gendoc.bat") + (delete-file "genproj.bat") + (delete-file "upgrade.bat") + ;; Remove references to deleted files. + (substitute* "dox/FILES_HTML.txt" + ((".*standard.*") + "") + ((".*UIKitSample.*") + "")) + #t)))) + (build-system cmake-build-system) + (arguments + '( ;There is no test target for make. OCCT provides an + + ;; 'Automated Testing System', which may be accessed after + ;; installation via the draw.sh script. draw.sh is located in + ;; the bin directory. For details see: + ;; https://www.opencascade.com/doc/occt-7.3.0/overview/html/\ + ;; occt_dev_guides__tests.html + #:tests? #f + ;; Configure without freeimage: attempting to link against the + ;; freeimage version 3.17 library leads to 'undefined + ;; reference' errors. + #:configure-flags (list "-DUSE_FREEIMAGE:BOOL=OFF" + "-DUSE_TBB:BOOL=ON" + "-DUSE_VTK:BOOL=OFF" + "-DBUILD_DOC_Overview:BOOL=OFF" + "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" + "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" + "-UCMAKE_INSTALL_LIBDIR"))) + (native-inputs (list doxygen fontconfig)) + (inputs (list freetype + ;; ("freeimage" ,freeimage) + glu + libxext + libxi + libxmu + mesa + tbb-2020 + tcl + tk)) + ;; TODO: build Overview documentation and add 'doc' output. + (home-page "https://www.opencascade.com") + (synopsis "Libraries for 3D modeling and numerical simulation") + (description + "Open CASCADE is a set of libraries for the development of applications +dealing with 3D CAD data or requiring industrial 3D capabilities. It includes +C++ class libraries providing services for 3D surface and solid modeling, CAD +data exchange, and visualization. It is used for development of specialized +software dealing with 3D models in design (CAD), manufacturing (CAM), +numerical simulation (CAE), measurement equipment (CMM), and quality +control (CAQ) domains. + +This is the certified version of the Open Cascade Technology (OCCT) library.") + (license (list ;OCCT library: + license:lgpl2.1 ;with an exception for the use of header + ;; files, see OCCT_LGPL_EXCEPTION.txt. + ;; Files src/OpenGl/glext.h, adm/cmake/cotire.cmake and + ;; src/OpenGl/OpenGl_HaltonSampler.hxx: + license:expat + ;; Files src/ExprIntrp/ExprIntrp.tab.* and + ;; src/StepFile/step.tab.*: + license:gpl3+ ;with Bison 2.2 exception. + ;; File src/NCollection/NCollection_UtfIterator.lxx: + (license:non-copyleft + "https://www.unicode.org/license.html") + ;; File src/NCollection/NCollection_StdAllocator.hxx: + license:public-domain)))) + (define-public opencascade-occt (package (name "opencascade-occt")