[PATCH] gnu: opencascade-occt: update to 7.9.0.

  • Done
  • quality assurance status badge
Details
5 participants
  • Andreas Enge
  • Kurt Kremitzki
  • Ludovic Courtès
  • nomike
  • Simon Tournier
Owner
unassigned
Submitted by
Kurt Kremitzki
Severity
normal

Debbugs page

K
K
Kurt Kremitzki wrote on 22 Apr 19:20 -0700
(address . guix-patches@gnu.org)(name . Kurt Kremitzki)(address . kurt@kwk.systems)
38a3aca00a7c1c8efafbe47d51e6c7bbdf4b59e7.1745374818.git.kurt@kwk.systems
* 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(-)

Toggle diff (66 lines)
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.

base-commit: b276cf2f9785c71cc37688c3e2b1db38e2c710a1
--
2.47.2
A
A
Andreas Enge wrote on 29 Apr 04:26 -0700
(name . Kurt Kremitzki)(address . kurt@kwk.systems)
aBC3eBa1NrJbLQuT@jurong
Hello Kurt,

thanks for your update suggestion!

We will need to coordinate with
(see also https://issues.guix.gnu.org/77811for a similar patch);
I would suggest to first complete #77881.

As from the discussion, I am quite certain that the update breaks at
least its depending package prusa-slicer; more generally, this can be
tested by running
./pre-inst-env guix build -P 1 opencascade-occt
locally.

In this case, the problem has also been found by QA:

Andreas
N
N
nomike wrote on 20 May 14:46 -0700
[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
(address . 78002@debbugs.gnu.org)(name . nomike)(address . nomike@nomike.com)
20250520214625.2812326-1-nomike@nomike.com
* gnu/packages/maths.scm (opencascade-occt-7.6.1): New variable

Change-Id: Id4f9e3cb31ebe247ff969cac752fcadfa6ad2109
---
gnu/packages/maths.scm | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)

Toggle diff (54 lines)
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")
--
2.49.0
N
N
nomike wrote on 20 May 14:51 -0700
(address . 78002@debbugs.gnu.org)(name . nomike)(address . nomike@nomike.com)
20250520215240.2823396-1-nomike@nomike.com
* 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(+)

Toggle diff (54 lines)
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")
--
2.49.0
K
K
kurt wrote on 27 May 13:08 -0700
c4170424829090bf43ad66bdd23a071e5e8cf307@kwk.systems
Hello Nomike,


May 20, 2025 at 4:51 PM, "nomike" <nomike@nomike.com> wrote:

Toggle quote (5 lines)
> Jus a small update to my patch to also use the better style of getting rid of the .bat files.
> ...
> + (delete-file "genconf.bat")


It looks like there was an issue with sending the updated patch in your last message: you mention changing the method of getting rid of the .bat files, but it's showing `delete-file` still instead of `for-each delete-file`.

Cheers,
Kurt
K
K
kurt wrote on 27 May 17:28 -0700
Re: [PATCH] gnu: opencascade-occt: update to 7.9.0.
(name . Andreas Enge)(address . andreas@enge.fr)(address . 78002@debbugs.gnu.org)
905118832e926845bca004cebb233bc22c7c9109@kwk.systems
Hello Andreas,


April 29, 2025 at 6:26 AM, "Andreas Enge" <andreas@enge.fr> wrote:



Toggle quote (5 lines)
>
> Hello Kurt,
>
> thanks for your update suggestion!

Thanks for your review as well!

Toggle quote (10 lines)
> As from the discussion, I am quite certain that the update breaks at
>
> least its depending package prusa-slicer; more generally, this can be
>
> tested by running
>
> ./pre-inst-env guix build -P 1 opencascade-occt
>
> locally.

Strangely, I remember running this, being surprised at the lack of failures, and indeed in my log, I even have a second check with `--dependents=2`, but after your message, I was of course able to reproduce the failure... I'm not sure what could have happened, but I'll chalk that up to user error. Perhaps some edge-case bug there though that I was not able to reproduce?

Cheers,
Kurt

P.S. Looking at this again, I noticed I missed the ending `$` regex in the third use of `for-each delete-file`. I may try figuring out how to send an updated patch, but perhaps that's the sort of thing that could just be fixed in a merge, so I thought I'd mention it here!
L
L
Ludovic Courtès wrote on 13 Jul 07:34 -0700
Re: [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
(address . kurt@kwk.systems)
87sej06ty9.fsf@gnu.org
Hi Kurt, nomike, Andreas,

kurt@kwk.systems writes:

Toggle quote (12 lines)
> May 20, 2025 at 4:51 PM, "nomike" <nomike@nomike.com> wrote:
>
>> Jus a small update to my patch to also use the better style of getting rid of the .bat files.
>> ...
>> + (delete-file "genconf.bat")
>
>
> It looks like there was an issue with sending the updated patch in
> your last message: you mention changing the method of getting rid of
> the .bat files, but it's showing `delete-file` still instead of
> `for-each delete-file`.

Could you consolidate these changes in a single patch?

It’s an important upgrade and it looks like it’s almost ready.

Thanks,
Ludo’.
K
K
Kurt Kremitzki wrote on 13 Jul 09:51 -0700
Re: [bug#78002] [PATCH] gn u: Add opencascade-occt-7.6 .1: Add separate package f or version 7.6.1 as this is a hard requirement for the new version of prusa-slic er due to a bug in newer versions of opencascade-occt
(name . Ludovic Courtès)(address . ludo@gnu.org)
C15BB4B8-8E65-4CEA-9C65-26F9860405C7@kwk.systems
Hi all, pardon the top-post from my phone. Aye, I've been wanting to migrate my patches to Codeberg. I will look into what's needed for proper attribution for this multi-person effort and submit something.

Cheers,
Kurt

On July 13, 2025 9:34:06 AM CDT, "Ludovic Courtès" <ludo@gnu.org> wrote:
Toggle quote (22 lines)
>Hi Kurt, nomike, Andreas,
>
>kurt@kwk.systems writes:
>
>> May 20, 2025 at 4:51 PM, "nomike" <nomike@nomike.com> wrote:
>>
>>> Jus a small update to my patch to also use the better style of getting rid of the .bat files.
>>> ...
>>> + (delete-file "genconf.bat")
>>
>>
>> It looks like there was an issue with sending the updated patch in
>> your last message: you mention changing the method of getting rid of
>> the .bat files, but it's showing `delete-file` still instead of
>> `for-each delete-file`.
>
>Could you consolidate these changes in a single patch?
>
>It’s an important upgrade and it looks like it’s almost ready.
>
>Thanks,
>Ludo’.
Attachment: file
L
L
Ludovic Courtès wrote on 15 Jul 04:57 -0700
Re: [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
(name . Kurt Kremitzki)(address . kurt@kwk.systems)
87jz49y8dd.fsf@gnu.org
Hi Kurt,

Kurt Kremitzki <kurt@kwk.systems> writes:

Toggle quote (3 lines)
> Hi all, pardon the top-post from my phone. Aye, I've been wanting to migrate my patches to Codeberg. I will look into what's needed for
> proper attribution for this multi-person effort and submit something.

Excellent, feel free to move them to a pull request.

For attribution, we usually add one or more ‘Co-authored-by’ tags in the
commit message.

Thanks,
Ludo’.
N
N
nomike (they/them) wrote on 15 Jul 05:28 -0700
(name . Ludovic Courtès)(address . ludo@gnu.org)
711d1ee3-947c-40d7-b5c8-a3bdd33b3233@nomike.com
I finished updating prusa-slicer a few days ago, which also includes adding a package for version 7.6.1 of open cascade-occt.

I force pushed my latest update on Sunday evening to fix issues with the commit comments and am since then waiting for enge or someone else to finally merge it.

Cheers
nomike

15 Jul 2025 14:21:13 Ludovic Courtès <ludo@gnu.org>:

Toggle quote (14 lines)
> Hi Kurt,
>
> Kurt Kremitzki <kurt@kwk.systems> writes:
>
>> Hi all, pardon the top-post from my phone. Aye, I've been wanting to migrate my patches to Codeberg. I will look into what's needed for
>> proper attribution for this multi-person effort and submit something.
>
> Excellent, feel free to move them to a pull request.
>
> For attribution, we usually add one or more ‘Co-authored-by’ tags in the
> commit message.
>
> Thanks,
> Ludo’.
Attachment: file
A
A
Andreas Enge wrote on 15 Jul 06:14 -0700
(name . nomike (they/them))(address . nomike@nomike.com)
aHZUG5FRvEt3LFke@jurong
Am Tue, Jul 15, 2025 at 02:28:58PM +0200 schrieb nomike (they/them):
Toggle quote (4 lines)
> I force pushed my latest update on Sunday evening to fix issues with the commit
> comments and am since then waiting for enge or someone else to finally merge
> it.

I have seen it, but am a bit busy now. If I have forgotten it by next
weekend, please send me a reminder email :)

Andreas
S
S
Simon Tournier wrote on 22 Aug 05:20 -0700
87tt1zwnsi.fsf@gmail.com
Hi,

On Tue, 15 Jul 2025 at 15:14, Andreas Enge <andreas@enge.fr> wrote:
Toggle quote (9 lines)
> Am Tue, Jul 15, 2025 at 02:28:58PM +0200 schrieb nomike (they/them):

>> I force pushed my latest update on Sunday evening to fix issues with the commit
>> comments and am since then waiting for enge or someone else to finally merge
>> it.
>
> I have seen it, but am a bit busy now. If I have forgotten it by next
> weekend, please send me a reminder email :)

Here the reminder email. ;-)

Closing, see 2cff1da9ad3d000a07a059e8f64fb2c4108eaf67 from https://codeberg.org/guix/guix/pulls/1217

Cheers,
simon
Closed
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 78002@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 78002
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch