From patchwork Wed Apr 23 02:20:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Kremitzki X-Patchwork-Id: 41951 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 9BD0027BC4A; Wed, 23 Apr 2025 03:22:36 +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=unavailable 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 0C03C27BC49 for ; Wed, 23 Apr 2025 03:22:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7PkX-00080j-PU; Tue, 22 Apr 2025 22:22:10 -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 1u7PkS-00080C-GY for guix-patches@gnu.org; Tue, 22 Apr 2025 22:22: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 1u7PkQ-0008WP-W3 for guix-patches@gnu.org; Tue, 22 Apr 2025 22:22: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=NzYWcUz4nPNm78kcHIjxn38KPunC0f6CmB6eq0qkzYU=; b=G9t57wW/GGOPQBpVexIz10apXPQR6ueIejWxZ1fAurPm+wR8V4yL88+qSIqpRqgD10nmlOCTddSIN3P+BoijB6xUl50dHyvNr42I0dBhE4Hz2mdMDhC+CfKxvBTlvZpqNOlf60t0f93dpqb17g+yvsduBxZec0+M30LNMgK9SkWi93QhvKrv7Q0E86+XW/cVf9cFB2FakY8cyr/yhtPbd8VZpqFgu7YvUZUB41WfaBn18NqcvtbkAKmTCihMqB6AvkfCYbV3sUavfqYP49cfI2c2GZPv3IDT+mxupunaRgbauPJSoYhiQgz+Rty2Ix/Lmjt9eQmy4GrFOqF5R508aQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7PkP-0006Sv-Nc; Tue, 22 Apr 2025 22:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78002] [PATCH] gnu: opencascade-occt: update to 7.9.0. Resent-From: Kurt Kremitzki Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 23 Apr 2025 02:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78002 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78002@debbugs.gnu.org Cc: Kurt Kremitzki , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.174537487524761 (code B ref -1); Wed, 23 Apr 2025 02:22:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Apr 2025 02:21:15 +0000 Received: from localhost ([127.0.0.1]:51153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7Pje-0006RI-GP for submit@debbugs.gnu.org; Tue, 22 Apr 2025 22:21:14 -0400 Received: from lists.gnu.org ([2001:470:142::17]:51750) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7PjY-0006Q7-Ou for submit@debbugs.gnu.org; Tue, 22 Apr 2025 22:21:10 -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 1u7PjK-0007Lo-J2 for guix-patches@gnu.org; Tue, 22 Apr 2025 22:20:55 -0400 Received: from out-177.mta0.migadu.com ([2001:41d0:1004:224b::b1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7PjD-0008Jw-Bq for guix-patches@gnu.org; Tue, 22 Apr 2025 22:20:54 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwk.systems; s=key1; t=1745374834; 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; bh=NzYWcUz4nPNm78kcHIjxn38KPunC0f6CmB6eq0qkzYU=; b=N6YEAowkPilFnxkaW7rZ9HQNgd3OawMRnfPfiNBWbTUonWmwrv5K1+QUkP9ACMXxYVVEGD Td82k4Oqf3xiWu0sh4MumzkbwDLRVqmj3dV2R4Ucsccja/trlHPRAWrUbXRKAIcG/hi2GV R2OrPF+bL3kn3Bk7qKlWam0btiqk6fzCzq6uEO5tWhlhfdKqXT5TMHwQsm4OWOvybjj/OY tA8BwFOOIbcu5VkjnKxfBIJrbaHfzp7Wg9sL9FqxAsU+ydv4lu8+Wpr9UhReXG85TrFaVH 07HON33pw5xnFmTSwHvjxCVFjx3rg7O1yRvs6G0uMv8kLYKpALiWpEgXGjGTbg== Date: Tue, 22 Apr 2025 21:20:18 -0500 Message-ID: <38a3aca00a7c1c8efafbe47d51e6c7bbdf4b59e7.1745374818.git.kurt@kwk.systems> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=2001:41d0:1004:224b::b1; envelope-from=kurt@kwk.systems; helo=out-177.mta0.migadu.com 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, SPF_HELO_PASS=-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: , Reply-to: Kurt Kremitzki X-ACL-Warn: , Kurt Kremitzki via Guix-patches X-Patchwork-Original-From: Kurt Kremitzki via Guix-patches via From: Kurt Kremitzki 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): Update to 7.9.0. [source]: Revise cleanup of batch files and templates [inputs]: Use newer TBB & rapidjson [arguments]: Build with rapidjson for glTF support Change-Id: I2d0c97bda54fde920aa63d4fb4ba4f0828be440e --- gnu/packages/maths.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) base-commit: b276cf2f9785c71cc37688c3e2b1db38e2c710a1 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4be9e71320..733532ff8d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -196,6 +196,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (srfi srfi-1) @@ -3327,7 +3328,7 @@ (define-public octave (define-public opencascade-occt (package (name "opencascade-occt") - (version "7.6.2") + (version "7.9.0") (properties '((release-tag-prefix . "^V") (release-tag-version-delimiter . "_"))) @@ -3342,7 +3343,7 @@ (define-public opencascade-occt version))))) (file-name (git-file-name name version)) (sha256 - (base32 "07z5d83vm9f50an7vhimzl7gbmri1dn6p2g999l5fgyaj5sg5f02")) + (base32 "1j6g6h5cqrcwslqnz7nkn9jxxa94gavz3s2h7b51r2ic484kd2df")) (modules '((guix build utils))) (snippet '(begin @@ -3350,10 +3351,9 @@ (define-public opencascade-occt (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") + (for-each delete-file (find-files "." "\\.bat$")) + (for-each delete-file (find-files "." "\\.bat\\.in$")) + (for-each delete-file (find-files "." "\\.bat\\.template")) ;; Remove references to deleted files. (substitute* "dox/FILES_HTML.txt" ((".*standard.*") "" ) @@ -3373,6 +3373,7 @@ (define-public opencascade-occt ;; reference' errors. #:configure-flags (list "-DUSE_FREEIMAGE:BOOL=OFF" + "-DUSE_RAPIDJSON:BOOL=ON" "-DUSE_TBB:BOOL=ON" "-DUSE_VTK:BOOL=OFF" "-DBUILD_DOC_Overview:BOOL=OFF" @@ -3388,7 +3389,8 @@ (define-public opencascade-occt libxi libxmu mesa - tbb-2020 + rapidjson + tbb tcl tk)) ;; TODO: build Overview documentation and add 'doc' output.