Package: guix-patches;
Reported by: nomike <nomike <at> nomike.com>
Date: Tue, 15 Apr 2025 01:17:05 UTC
Severity: normal
Tags: patch
Done: Andreas Enge <andreas <at> enge.fr>
To reply to this bug, email your comments to 77813 AT debbugs.gnu.org.
There is no need to reopen the bug first.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#77813; Package guix-patches.
(Tue, 15 Apr 2025 01:17:05 GMT) Full text and rfc822 format available.nomike <nomike <at> nomike.com>:guix-patches <at> gnu.org.
(Tue, 15 Apr 2025 01:17:05 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: nomike <nomike <at> nomike.com> To: guix-patches <at> gnu.org Cc: nomike <nomike <at> nomike.com> Subject: [PATCH 4/4] gnu: opencascade-occt: style Date: Tue, 15 Apr 2025 03:15:09 +0200
Change-Id: Icbeccf64e2328eecfc62b5e03260e46cde05e8d3
---
gnu/packages/maths.scm | 104 ++++++++++++++++++++---------------------
1 file changed, 51 insertions(+), 53 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 5461650e3e..7f2afcce76 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -68,6 +68,7 @@
;;; Copyright © 2024, 2025 Artyom V. Poptsov <poptsov.artyom <at> gmail.com>
;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
;;; Copyright © 2025 Luca Cirrottola <luca.cirrottola <at> inria.fr>
+;;; Copyright © 2025 nomike Postmann <nomike <at> nomike.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3328,37 +3329,37 @@ (define-public opencascade-occt
(package
(name "opencascade-occt")
(version "7.9.0")
- (properties
- '((release-tag-prefix . "^V")
- (release-tag-suffix . "")
- (release-tag-version-delimiter . "_")))
+ (properties '((release-tag-prefix . "^V") (release-tag-suffix . "")
+ (release-tag-version-delimiter . "_")))
(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 "1j6g6h5cqrcwslqnz7nkn9jxxa94gavz3s2h7b51r2ic484kd2df"))
- (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")
- ;; Remove references to deleted files.
- (substitute* "dox/FILES_HTML.txt"
- ((".*standard.*") "" )
- ((".*UIKitSample.*") ""))
- #t))))
+ (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 "1j6g6h5cqrcwslqnz7nkn9jxxa94gavz3s2h7b51r2ic484kd2df"))
+ (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")
+ ;; Remove references to deleted files.
+ (substitute* "dox/FILES_HTML.txt"
+ ((".*standard.*")
+ "")
+ ((".*UIKitSample.*")
+ ""))
+ #t))))
(build-system cmake-build-system)
(arguments
- '(;; There is no test target for make. OCCT provides an
+ '( ;There is no test target for make. OCCT provides an
+
;; 'Automated Testing System', which may be accessed after
;; installation via the draw.sh script. draw.sh is located in
;; the bin directory. For details see:
@@ -3368,27 +3369,24 @@ (define-public opencascade-occt
;; Configure without freeimage: attempting to link against the
;; freeimage version 3.17 library leads to 'undefined
;; reference' errors.
- #:configure-flags
- (list "-DUSE_FREEIMAGE:BOOL=OFF"
- "-DUSE_TBB:BOOL=ON"
- "-DUSE_VTK:BOOL=OFF"
- "-DBUILD_DOC_Overview:BOOL=OFF"
- "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
- "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON"
- "-UCMAKE_INSTALL_LIBDIR")))
- (native-inputs (list fontconfig
- doxygen))
- (inputs
- (list freetype
- ;("freeimage" ,freeimage)
- glu
- libxext
- libxi
- libxmu
- mesa
- tbb
- tcl
- tk))
+ #:configure-flags (list "-DUSE_FREEIMAGE:BOOL=OFF"
+ "-DUSE_TBB:BOOL=ON"
+ "-DUSE_VTK:BOOL=OFF"
+ "-DBUILD_DOC_Overview:BOOL=OFF"
+ "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
+ "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON"
+ "-UCMAKE_INSTALL_LIBDIR")))
+ (native-inputs (list fontconfig doxygen))
+ (inputs (list freetype
+ ;; ("freeimage" ,freeimage)
+ glu
+ libxext
+ libxi
+ libxmu
+ mesa
+ tbb
+ tcl
+ tk))
;; TODO: build Overview documentation and add 'doc' output.
(home-page "https://www.opencascade.com")
(synopsis "Libraries for 3D modeling and numerical simulation")
@@ -3402,15 +3400,15 @@ (define-public opencascade-occt
control (CAQ) domains.
This is the certified version of the Open Cascade Technology (OCCT) library.")
- (license (list ;; OCCT library:
- license:lgpl2.1; with an exception for the use of header
- ; files, see OCCT_LGPL_EXCEPTION.txt.
+ (license (list ;OCCT library:
+ license:lgpl2.1 ;with an exception for the use of header
+ ;; files, see OCCT_LGPL_EXCEPTION.txt.
;; Files src/OpenGl/glext.h, adm/cmake/cotire.cmake and
;; src/OpenGl/OpenGl_HaltonSampler.hxx:
license:expat
;; Files src/ExprIntrp/ExprIntrp.tab.* and
;; src/StepFile/step.tab.*:
- license:gpl3+ ; with Bison 2.2 exception.
+ license:gpl3+ ;with Bison 2.2 exception.
;; File src/NCollection/NCollection_UtfIterator.lxx:
(license:non-copyleft
"https://www.unicode.org/license.html")
--
2.49.0
Andreas Enge <andreas <at> enge.fr>:nomike <nomike <at> nomike.com>:Message #10 received at 77813-done <at> debbugs.gnu.org (full text, mbox):
From: Andreas Enge <andreas <at> enge.fr> To: nomike <nomike <at> nomike.com> Cc: 77811 <at> debbugs.gnu.org, 77813-done <at> debbugs.gnu.org Subject: Re: [PATCH 4/4] gnu: opencascade-occt: style Date: Tue, 15 Apr 2025 22:21:07 +0200
#77813 depends on https://issues.guix.gnu.org/77811 Could you maybe try to send a new series of two patches as a v2 to 77811 <at> debbugs.gnu.org ? I am closing the other one to regroup the issues. Concerning the update (to version 7.9.0, not 7.9.8), QA has apparently picked up the complete series nevertheless: https://qa.guix.gnu.org/issue/77810 and it turns out that the current prusa-slicer does require the older version of opencascade-occt: https://data.qa.guix.gnu.org/gnu/store/33a52hfl83jw112pwrqifqg5wchz5di5-prusa-slicer-2.7.4.drv But there is also a new prusa-slicer version, maybe updating prusa-slicer will solve the problem. When sending a new patch series, please cc me so that I am informed of the update. Thanks, Andreas
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.