GNU bug report logs - #78002
[PATCH] gnu: opencascade-occt: update to 7.9.0.

Previous Next

Package: guix-patches;

Reported by: Kurt Kremitzki <kurt <at> kwk.systems>

Date: Wed, 23 Apr 2025 02:22:01 UTC

Severity: normal

Tags: patch

To reply to this bug, email your comments to 78002 AT debbugs.gnu.org.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to andreas <at> enge.fr, bavier <at> posteo.net, sharlatanus <at> gmail.com, guix-patches <at> gnu.org:
bug#78002; Package guix-patches. (Wed, 23 Apr 2025 02:22:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Kurt Kremitzki <kurt <at> kwk.systems>:
New bug report received and forwarded. Copy sent to andreas <at> enge.fr, bavier <at> posteo.net, sharlatanus <at> gmail.com, guix-patches <at> gnu.org. (Wed, 23 Apr 2025 02:22:01 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kurt Kremitzki <kurt <at> kwk.systems>
To: guix-patches <at> gnu.org
Cc: Kurt Kremitzki <kurt <at> kwk.systems>
Subject: [PATCH] gnu: opencascade-occt: update to 7.9.0.
Date: Tue, 22 Apr 2025 21:20:18 -0500
* 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(-)

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





Information forwarded to guix-patches <at> gnu.org:
bug#78002; Package guix-patches. (Tue, 29 Apr 2025 11:28:06 GMT) Full text and rfc822 format available.

Message #8 received at 78002 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Kurt Kremitzki <kurt <at> kwk.systems>
Cc: 78002 <at> debbugs.gnu.org, nomike <at> nomike.com
Subject: Re: [PATCH] gnu: opencascade-occt: update to 7.9.0.
Date: Tue, 29 Apr 2025 13:26:48 +0200
Hello Kurt,

thanks for your update suggestion!

We will need to coordinate with
   https://issues.guix.gnu.org/77881
(see also https://issues.guix.gnu.org/77811 for 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:
   https://qa.guix.gnu.org/issue/78002
   https://qa.guix.gnu.org/issue/78002/package-changes?x86_64-linux-change=broken&x86_64-linux-change=still-failing&x86_64-linux-change=unknown-to-failing&x86_64-linux-change=new-failing

Andreas





Information forwarded to kurt <at> kwk.systems, andreas <at> enge.fr, guix-patches <at> gnu.org:
bug#78002; Package guix-patches. (Tue, 20 May 2025 21:48:01 GMT) Full text and rfc822 format available.

Message #11 received at 78002 <at> debbugs.gnu.org (full text, mbox):

From: nomike <nomike <at> nomike.com>
To: 78002 <at> debbugs.gnu.org
Cc: nomike <nomike <at> nomike.com>
Subject: [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
Date: Tue, 20 May 2025 23:46:06 +0200
* 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")
-- 
2.49.0





Information forwarded to kurt <at> kwk.systems, andreas <at> enge.fr, nomike <at> nomike.com, guix-patches <at> gnu.org:
bug#78002; Package guix-patches. (Tue, 20 May 2025 21:53:01 GMT) Full text and rfc822 format available.

Message #14 received at 78002 <at> debbugs.gnu.org (full text, mbox):

From: nomike <nomike <at> nomike.com>
To: 78002 <at> debbugs.gnu.org
Cc: nomike <nomike <at> nomike.com>
Subject: [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
Date: Tue, 20 May 2025 23:51:22 +0200
* 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")
-- 
2.49.0





Information forwarded to guix-patches <at> gnu.org:
bug#78002; Package guix-patches. (Tue, 27 May 2025 20:09:02 GMT) Full text and rfc822 format available.

Message #17 received at 78002 <at> debbugs.gnu.org (full text, mbox):

From: kurt <at> kwk.systems
To: "nomike" <nomike <at> nomike.com>, 78002 <at> debbugs.gnu.org
Subject: 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
Date: Tue, 27 May 2025 20:08:05 +0000
Hello Nomike,


May 20, 2025 at 4:51 PM, "nomike" <nomike <at> 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`.

Cheers,
Kurt




Information forwarded to guix-patches <at> gnu.org:
bug#78002; Package guix-patches. (Wed, 28 May 2025 00:30:02 GMT) Full text and rfc822 format available.

Message #20 received at 78002 <at> debbugs.gnu.org (full text, mbox):

From: kurt <at> kwk.systems
To: "Andreas Enge" <andreas <at> enge.fr>
Cc: 78002 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: opencascade-occt: update to 7.9.0.
Date: Wed, 28 May 2025 00:28:44 +0000
Hello Andreas,


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



> 
> Hello Kurt,
> 
> thanks for your update suggestion!

Thanks for your review as well!

> 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!




This bug report was last modified 23 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.