diff mbox series

[bug#78002] 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

Message ID 20250520215240.2823396-1-nomike@nomike.com
State New
Headers
Series [bug#78002] 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 |

Commit Message

nomike (they/them) May 20, 2025, 9:51 p.m. UTC 
* 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(+)

Comments

yelninei--- via Guix-patches via May 27, 2025, 8:08 p.m. UTC | #1 
Hello Nomike,


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`.

Cheers,
Kurt
Ludovic Courtès July 13, 2025, 2:34 p.m. UTC | #2 
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’.
Kurt Kremitzki July 13, 2025, 4:51 p.m. UTC | #3 
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:
>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’.
Ludovic Courtès July 15, 2025, 11:57 a.m. UTC | #4 
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’.
nomike (they/them) July 15, 2025, 12:28 p.m. UTC | #5 
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>:

> 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’.
Andreas Enge July 15, 2025, 1:14 p.m. UTC | #6 
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 :)

Andreas
Simon Tournier Aug. 22, 2025, 12:20 p.m. UTC | #7 
Hi,

On Tue, 15 Jul 2025 at 15:14, Andreas Enge <andreas@enge.fr> wrote:
> 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
diff mbox series

Patch

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")