From patchwork Thu Apr 17 22:48:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nomike X-Patchwork-Id: 41752 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 B067827BC4B; Thu, 17 Apr 2025 23:54:32 +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 10B7B27BC4A for ; Thu, 17 Apr 2025 23:54:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5Y7T-0007iX-G6; Thu, 17 Apr 2025 18:54:07 -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 1u5Y7R-0007iD-1f for guix-patches@gnu.org; Thu, 17 Apr 2025 18:54: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 1u5Y7Q-00072D-Gy for guix-patches@gnu.org; Thu, 17 Apr 2025 18:54:04 -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:Date:From:To:Subject; bh=DB2Kel1CXOzEAsaXIQhbc3Su9zleEoQs2oKJtpRL+5A=; b=Tbyarp6hlqHvZUhV+shUI+olwStHynITMe1fzecUM5ulK1UMO4hGGjdxsVZ0qsSb4c/3xBb0/Y36C15wa/A6vwLuDF2VQqn+J8cKedMFLm/wHFrmLc/TuVY9Fv8povRKT2bVAtrZhwdnPpZs12EHKe/9Ww7P4hVn2Ls1tEebSa4qOHKwZOQoNdjC4sk4UZjexfRvGzh4oaICt2I9ltXqdDtRJ6rHya7/v3r8DGDAjh+/lAX5QDPWuMQvEkKSByzlNxkb4uNSRTNYWSqkwUungEzx3adDLBOA6R1XzB/tOzK9bSMBQjd/2yLhpCe1BLsRIU/bZ1kW38A3JWslJoAkpQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5Y7P-0000vf-UJ for guix-patches@gnu.org; Thu, 17 Apr 2025 18:54:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77881] [PATCH] gnu: Add opencascade-occt-7.6.1. Resent-From: nomike Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Apr 2025 22:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77881 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77881@debbugs.gnu.org Cc: nomike X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17449304133238 (code B ref -1); Thu, 17 Apr 2025 22:54:03 +0000 Received: (at submit) by debbugs.gnu.org; 17 Apr 2025 22:53:33 +0000 Received: from localhost ([127.0.0.1]:48831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5Y6r-0000pV-8G for submit@debbugs.gnu.org; Thu, 17 Apr 2025 18:53:32 -0400 Received: from lists.gnu.org ([2001:470:142::17]:40142) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5Y6n-0000nl-Kf for submit@debbugs.gnu.org; Thu, 17 Apr 2025 18:53:26 -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 1u5Y6g-0007cd-FQ for guix-patches@gnu.org; Thu, 17 Apr 2025 18:53:19 -0400 Received: from butterfly.birch.relay.mailchannels.net ([23.83.209.27]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u5Y6d-0006ti-7Y for guix-patches@gnu.org; Thu, 17 Apr 2025 18:53:18 -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 C2CAB8311F; Thu, 17 Apr 2025 22:53:12 +0000 (UTC) Received: from pdx1-sub0-mail-a254.dreamhost.com (100-101-173-18.trex-nlb.outbound.svc.cluster.local [100.101.173.18]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 59ADE81955; Thu, 17 Apr 2025 22:53:12 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1744930392; a=rsa-sha256; cv=none; b=9O8z1sbajfJN4RVKW3g4X6ymjsL6X1ioVGhzvmw6/em1gHZE23QseIozcO+Vay8YY4EnBd 0b4OFqcNyfoLDU1k4APUsIQ/iD0ffBC9KyO660jwg2JvzhLG+AGhnayNzMY8WUdISC1Wm6 7fuTa7kL6HYrg7lQtuxh8sjNDS61+ty5wBJMRaXuDkdleNmPZDIPP7I17sFV89rZCDClve LrBrWFtAinHhQb9OpVxB8ua/yCFCeDQRtwYy3txAsFP17KyRwLaL90hFrQt0W9BUP+1IyV vDbMIuFStBi1KO4Y3ByV4oaK/cktqi94U9PL+cYwfHA3TX197ITUtvK6mheAXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1744930392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=DB2Kel1CXOzEAsaXIQhbc3Su9zleEoQs2oKJtpRL+5A=; b=OHAMJFQyWIgsJLxhc7kkuQgXLPSD/XaQUYEU/uqqsCrhOVKyF3R0wDiEpYQu9XvW+lR3Sw MXJ+vbvqUsiIieI+0hz7NfrLMRv1duksIaNT+5dMKoPFLiSuChESBCyCys8L5/X/I8IM8I O6TkOmJ52dob8WrGn/ztco6fjjR2/4yauoat16Z8BJVNP/EENGsz9NOlKE2gakGH9XpKMf qlEWkZR52f0h49DPbxkH83tlBDgCjXLTOjIKnApJxEXpEY28Z4pixgmNUQsZxJQpThBrYk nHHrDlE2EnnAnTs84aJJboHQ2os8t5Wv/ge0RlO2Xd00JAhToNHbk6g58vFiGA== ARC-Authentication-Results: i=1; rspamd-77f95b8c6b-7rggx; auth=pass smtp.auth=dreamhost smtp.mailfrom=nomike@nomike.com X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|nomike@nomike.com X-MailChannels-Auth-Id: dreamhost X-Tangy-Zesty: 42c934c364ae5037_1744930392581_3453510327 X-MC-Loop-Signature: 1744930392581:49206240 X-MC-Ingress-Time: 1744930392581 Received: from pdx1-sub0-mail-a254.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.101.173.18 (trex/7.0.3); Thu, 17 Apr 2025 22:53:12 +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-a254.dreamhost.com (Postfix) with ESMTPSA id 4ZdtTg6HXXzCg; Thu, 17 Apr 2025 15:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1744930392; bh=DB2Kel1CXOzEAsaXIQhbc3Su9zleEoQs2oKJtpRL+5A=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=lGZVCAio7rUch4eXZMWzjy6qtKa2ceBoWNmwnbm/vHm1ZDi13ZmZak7Vrg9nLHUmo 3f0dOXKNVoVmNH5E/QMmVS8NW4wZYkTKkWi5nij3sebZXa6tn36OyO+6l4cwVObtDQ cvYnNiZXvTQWOqB82TXZzOd38ek8Nfyd5gB4Ki3m9p992+pLP8H5LX8bMbsNRoesNM kwskJF99qKI/hQncLw9xDL83M5yugrKTMJKpBptlGxyFLHG2jVGJt7EjPm95n5qJgK 6Vlwy3hqj9wXOEe1HDPKqTm4lJ6yLZtM4sxlfxCK48M9bswYFrFzpFkuxuX437F3mW ckXbxB0OfjQgA== From: nomike Date: Fri, 18 Apr 2025 00:48:59 +0200 Message-ID: <20250417225257.2231907-1-nomike@nomike.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=23.83.209.27; envelope-from=nomike@nomike.com; helo=butterfly.birch.relay.mailchannels.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-7.6.1): New variable. Change-Id: I24a4df83c77f62707ceff88ee1880d859c2bb2b5 --- prusa-slicer reverted back to version 7.6.1 of opencascade-occt as a hard-coded dependency "because newer versions are triangulating chamfers incorrectly.". See https://github.com/prusa3d/PrusaSlicer/commit/c6a02106fd1d3caa9a48a6b7c2bdd04546b24485. This patch adds that version, so prusa-slicer could be built successfully. gnu/packages/maths.scm | 96 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4be9e71320..9efce08fb7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3324,6 +3324,102 @@ (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")