From patchwork Tue May 20 21:51:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nomike X-Patchwork-Id: 42787 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 2687927BC4B; Tue, 20 May 2025 22:53:19 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 6BB3427BC49 for ; Tue, 20 May 2025 22:53:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHUtV-00005H-1j; Tue, 20 May 2025 17:53:05 -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 1uHUtT-0008WT-0t for guix-patches@gnu.org; Tue, 20 May 2025 17:53:03 -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 1uHUtS-00065E-G5 for guix-patches@gnu.org; Tue, 20 May 2025 17:53:02 -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:In-Reply-To:References:Subject; bh=x/SnpRKvP/jz4lTJdNAoYWInMpUb9e/8uc1PUNOQvm0=; b=XIe9DQrQY3uHJCljKNtnGSKw9tPdnK3BkH7EpfrLROu8LU7aHqAp8LdTZfUrkSGFme12cNaozH9qCcwVMXeqe4jXpG/tfqNL7x9r3d2N5lrnbn/6MdhXi/TTNWix1dwEHkSF1uiTRg2C5rmObQX803fQ9MJFIEnZqJKsVjogcvGh8IHb1f/k0Jy/ybv6x1GdTicbwgMQxP2rRiCuJcPQ6hzgv4FH0Mj1/Bjd7Tns0vqYfzvudOvywb0gGhMCA2AybfaEuxMslMu1H4vFIkxZuiehetUpE6YXDDPqgggv5AYI9eKu+WSlXv05vqM3ZakyK6dR+PJSSAZKZtSeLujhcQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uHUtR-0000Pm-Pd; Tue, 20 May 2025 17:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78002] [PATCH] gnu: Add opencascade-occt-7.6.1: Add separate package for version 7.6.1 as this is a hard requirement for the new version of prusa-slicer due to a bug in newer versions of opencascade-occt References: <38a3aca00a7c1c8efafbe47d51e6c7bbdf4b59e7.1745374818.git.kurt@kwk.systems> In-Reply-To: <38a3aca00a7c1c8efafbe47d51e6c7bbdf4b59e7.1745374818.git.kurt@kwk.systems> Resent-From: nomike Original-Sender: "Debbugs-submit" Resent-CC: kurt@kwk.systems, andreas@enge.fr, nomike@nomike.com, guix-patches@gnu.org Resent-Date: Tue, 20 May 2025 21:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78002 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78002@debbugs.gnu.org Cc: nomike , Kurt Kremitzki , Andreas Enge , nomike X-Debbugs-Original-Xcc: Kurt Kremitzki , Andreas Enge , nomike Received: via spool by 78002-submit@debbugs.gnu.org id=B78002.17477779741521 (code B ref 78002); Tue, 20 May 2025 21:53:01 +0000 Received: (at 78002) by debbugs.gnu.org; 20 May 2025 21:52:54 +0000 Received: from localhost ([127.0.0.1]:37696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHUtK-0000OT-3a for submit@debbugs.gnu.org; Tue, 20 May 2025 17:52:54 -0400 Received: from tiger.tulip.relay.mailchannels.net ([23.83.218.248]:13565) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHUtG-0000Np-RT for 78002@debbugs.gnu.org; Tue, 20 May 2025 17:52: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 1908C18305F; Tue, 20 May 2025 21:52:49 +0000 (UTC) Received: from pdx1-sub0-mail-a235.dreamhost.com (100-112-52-184.trex-nlb.outbound.svc.cluster.local [100.112.52.184]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 8A6DB182F8F; Tue, 20 May 2025 21:52:48 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1747777968; a=rsa-sha256; cv=none; b=6Fsh0SanbC1izS29CfK9cYFzOsc+nS7oxYOvaG/gQVO4Jl1r8uGitmZDNema6dvJX4Hn/O UpUyA+yXpFEYvSxHPxXo6Uqa1t2vCicuY1ZMvDAkeLFHYBvaNlke6mNhoO6cpOeHaD47Ww BHbQdQiN5UsYFTF/MhYCSSQp8jZVJpYGmRFIf8KMY5iW9T/SxwE5HkS5la4gMgBhh+CXhL 6y0pkBL+L2owt8y4WwpnjSYX0MtfmDVRe4d5QQS7c7Gc0OQtn2HgOeueWF84zknar2vWVc 8ZT7MWgrQoKm+Wf3TAHkGVJ0eIhhxpKmZqPDhNa3VnWe3gcejRp+vqrb1HcH1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1747777968; 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=x/SnpRKvP/jz4lTJdNAoYWInMpUb9e/8uc1PUNOQvm0=; b=jDyN/sJBVhaPhojpMI14DESEMeZWyzm/M/CNZSDiICgKQCC6a0p3AcwA1Whsfj5g5Ckp+1 /MssNoxX3+3V71NvCZT90rtqH+fMk6hCympgspaFpK+bp2hosU5FnWZhdCYXVHOhCNe7SG 5M242Tbrww9BmJife3EKyCrV2Y0vRvqLIwliEj9JhxBXIHv5ULBcoYTKIVexGtg9Ly5Gz4 KmQVNqQau5KG01sb01p78Ja3isNd2RLNLQzX8ZWsyblL84XYXjTxs0LKXWAzZEdSKNJSG4 Bz6HZpLfeeCY51tRXXK7Vmwf8Rf4yQS5OGpT5bYnQfAQi+9ba8JE5YwsDlHPnA== ARC-Authentication-Results: i=1; rspamd-5b49d78d5-rpfn5; 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-Harmony-Plucky: 5c1a32d068755a7e_1747777968790_3664285067 X-MC-Loop-Signature: 1747777968790:2845326829 X-MC-Ingress-Time: 1747777968790 Received: from pdx1-sub0-mail-a235.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.112.52.184 (trex/7.0.3); Tue, 20 May 2025 21:52: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-a235.dreamhost.com (Postfix) with ESMTPSA id 4b27Zm0RR4z52; Tue, 20 May 2025 14:52:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1747777968; bh=x/SnpRKvP/jz4lTJdNAoYWInMpUb9e/8uc1PUNOQvm0=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=fApei5TeI3mppSpJkxq3qZNQeP2CpOlhM1mrHQzLagQUDQ5rSjsCF/vn1Wr4IHmZO /pm83ADgWjOt0554WVtZiBn93XkoGX9T4hjLIS+KdIYZ/hfvJJM2U9fSAs3If3JcMW FbylmfYsQ5qyrvuJ1WfuWI/17ySE9IpCPOc/AAZ8S5CQN/C9WGN/AKU8D0hE2UH4Z/ FzsgmUx0QStgAAojlzOsnEYdQwPXzKNx8qstnyipggimXYWFtGmdGd3wYPJI0K8NuE 7kVzzC9l2htc7tnPcF/jnL7EPnsTIDVNXuxG8+WHLGv9A2qtvFtzs1wxFXEsxNGtHC 4ZWwRc/q2aPMA== From: nomike Date: Tue, 20 May 2025 23:51:22 +0200 Message-ID: <20250520215240.2823396-1-nomike@nomike.com> X-Mailer: git-send-email 2.49.0 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: Id4f9e3cb31ebe247ff969cac752fcadfa6ad2109 --- Jus a small update to my patch to also use the better style of getting rid of the .bat files. gnu/packages/maths.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 781162eca4..06412fd42e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3478,6 +3478,47 @@ (define-public opencascade-occt ;; File src/NCollection/NCollection_StdAllocator.hxx: license:public-domain)))) +(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 + (inherit opencascade-occt) + (name "opencascade-occt") + (version "7.6.1") + (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)))) + (inputs (modify-inputs (package-inputs opencascade-occt) + (replace "tbb" tbb-2020) + (delete rapidjson))))) + (define-public fast-downward (package (name "fast-downward")