From patchwork Tue May 20 21:46:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nomike X-Patchwork-Id: 42785 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 24B3327BC4B; Tue, 20 May 2025 22:48:21 +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 EBBE627BC49 for ; Tue, 20 May 2025 22:48:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHUoh-0006tT-Pq; Tue, 20 May 2025 17:48: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 1uHUof-0006tL-9D for guix-patches@gnu.org; Tue, 20 May 2025 17:48: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 1uHUoe-00050P-UY for guix-patches@gnu.org; Tue, 20 May 2025 17:48:05 -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=2pFYo7syzMdUatOGemhPZVAT97QtkmjnaWCxIZZVhkg=; b=LM1cxOxdDyIvnoZIlirm4qsgarcIBSktQjz+0eb2lNPz4X6zCSV+fEcT4I0cxwsv27s9lH3HWbujqzmMlZVxSRLkFVnyWf2ccmFgaiB4/7A64IH6XWhrxFkhcN5F/wX+xbaHqZV1g0NyMeMSqUVXT8qKZL+8wlM7qRGOboOQPWg1bt5dl2rc01+RHrCcgjVkvi/thcSYKxYfK4+Iii9zl2l/if4FP1Dk2zTPLJSiwZhRCEPCpTx+HoFsU//ONzgcz5YvmzNNELpBJzGEivLnWibzOQu+rln6zgq7PNAPWPenyXVyP5s401KQRroBESXrys8Un0W4c6gGmY/FY0vp1g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uHUob-0008JG-Ue; Tue, 20 May 2025 17:48: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, guix-patches@gnu.org Resent-Date: Tue, 20 May 2025 21:48: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 X-Debbugs-Original-Xcc: Kurt Kremitzki , Andreas Enge Received: via spool by 78002-submit@debbugs.gnu.org id=B78002.174777765131779 (code B ref 78002); Tue, 20 May 2025 21:48:01 +0000 Received: (at 78002) by debbugs.gnu.org; 20 May 2025 21:47:31 +0000 Received: from localhost ([127.0.0.1]:37617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHUo7-0008GU-9h for submit@debbugs.gnu.org; Tue, 20 May 2025 17:47:31 -0400 Received: from buffalo.tulip.relay.mailchannels.net ([23.83.218.24]:56113) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHUo2-0008Fg-Pm for 78002@debbugs.gnu.org; Tue, 20 May 2025 17:47:28 -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 C912278264C; Tue, 20 May 2025 21:47:24 +0000 (UTC) Received: from pdx1-sub0-mail-a235.dreamhost.com (100-112-106-115.trex-nlb.outbound.svc.cluster.local [100.112.106.115]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 6E3AA782E23; Tue, 20 May 2025 21:47:24 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1747777644; a=rsa-sha256; cv=none; b=y75Haif9p9FiXlvnvjL/GVxI/p10EhJGY1Dt+hOaCT6wyk5ZfiaRqt19quxXFOHUL/UgI6 FYcY8Zb/7ZmQqb5tiGdsQ/gvUPdSpEhFloN1li6Ns+QgazolWEHbncDlSctDkqbaFqQjqJ rvQ4vSkpTUg2El3Jwj+ytvyel5py2qQNq94FWCf6SA0F11dr86y1y6ZigT9Jg66ul7r9Fn X8jOsj1YR+uegMiV9LTvLGWi2w63vFeg84D4fWoc8Kk1p3XnaY7D+nSdPtf3CkjzlDRzmq d0cK2zGqy6Yi3Pr766opcldSEcUNz1qjnHIdslVg5q4rKXbP5yuvte4HPvAdHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1747777644; 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=2pFYo7syzMdUatOGemhPZVAT97QtkmjnaWCxIZZVhkg=; b=ywakCFktOHA4k9j/F3wYRazA3uNFtZ1SN68nALITBuJpGtlYXR5qvikhrPbvv4qxssvAiq IrNauSqe5dMJ50/OFlLV/COqdqaV1gC/1hZ0TuPQgCQqSIayKh4XbOaBzJDpFGmWO/0Jlu Sq/KSGlXL+o2dyDqcCSZuLVr4Q3Vst9lD0yKyxVvNjyBJxvG9pB5PZtfTspaxr/LQrgZxp 4Dautd4OSm8XVgIBux+Sw49pS7fipK928TMNuaZVTHzPp6z8xqiKPDfTV902e6HmeaVykq K3LsOlWMnD2+/APEQSRcm1eR+Zm9qSgGt4w9LdnWQO4FB2RQuCirvpek/elHUQ== ARC-Authentication-Results: i=1; rspamd-5b49d78d5-scvsk; 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-Thread-Spot: 1ad283eb01a0757b_1747777644661_1788471904 X-MC-Loop-Signature: 1747777644661:3855901628 X-MC-Ingress-Time: 1747777644661 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.106.115 (trex/7.0.3); Tue, 20 May 2025 21:47:24 +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 4b27SW6wyLz52; Tue, 20 May 2025 14:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1747777644; bh=2pFYo7syzMdUatOGemhPZVAT97QtkmjnaWCxIZZVhkg=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=hhogRcu/ibFZ+6SjCQ8u+kNJZy8WezZK8cQsgPIHlVt6xa/f8ssrcj5BIm2SFJnqE kZRsC0Heehy2QboONRJvec5t9UjRtKKibYhBwxJ2StnDLZJYP3K56MPyGktCcM/PYA 0VKiePlM6QES8zNK5ONxHRNqoe7v5+KuKvWj9lc5Wlrk70xQ4qXBel0eg9vB1XDAh0 UahsHJe4vH2PJPp7mIailCqUG7P+/m30qi+jcugWxf8dfx7mnlBV+lOzL/haCxByVg qllrOxKH0CnkJEOLQhTH2VjKL/80SpWDJyiyNmH15j9foOdo8PUZFJPeJ74+Hx9KAf 2wue4pVxNdAag== From: nomike Date: Tue, 20 May 2025 23:46:06 +0200 Message-ID: <20250520214625.2812326-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 --- 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")