[PATCH]: Update FreeCAD to 0.19.1

DoneSubmitted by Ekaitz Zarraga.
Details
3 participants
  • Ekaitz Zarraga
  • Leo Famulari
  • Maxime Devos
Owner
unassigned
Severity
normal
E
E
Ekaitz Zarraga wrote on 14 Apr 17:59 +0200
(name . guix-patches@gnu.org)(address . guix-patches@gnu.org)
m_h_ks9CqvOZi3cTATp3NMe7nn7GQ4D_lNmHTyjumMdbRLLo0kDr2azjpMuPl_WvNRmRlYxCSteMDK_BypDhvlyVVHyzDRcVGIiHblvb_c0=@elenq.tech
Hi,
This set of patches update freecad from unstable to the 0.19.1 release.
More information in this help-guix thread:
https://lists.gnu.org/archive/html/help-guix/2021-04/msg00118.html
Thanks!
From 48fc072af9b595c7e71f0f06d9963685e7d3a796 Mon Sep 17 00:00:00 2001From: Ekaitz Zarraga <ekaitz@elenq.tech>Date: Wed, 14 Apr 2021 15:48:06 +0200Subject: [PATCH 1/2] gnu: Add vtk-8.
gnu/packages/image-processing (vtk-8): New variable.--- gnu/packages/image-processing.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
Toggle diff (37 lines)diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scmindex ce2242a658..16c9887741 100644--- a/gnu/packages/image-processing.scm+++ b/gnu/packages/image-processing.scm@@ -15,6 +15,7 @@ ;;; Copyright © 2021 Oleh Malyi <astroclubzp@gmail.com> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2021 Andy Tai <atai@atai.org>+;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; ;;; This file is part of GNU Guix. ;;;@@ -349,6 +350,22 @@ a suite of 3D interaction widgets, supports parallel processing, and integrates with various databases on GUI toolkits such as Qt and Tk.") (license license:bsd-3))) +;; freecad needs an old version of VTK, because VTK's API changed from 8 to 9+(define-public vtk-8+ (package (inherit vtk)+ (version "8.2.0")+ (source (origin+ (method url-fetch)+ (uri (string-append "https://vtk.org/files/release/"+ (version-major+minor version)+ "/VTK-" version ".tar.gz"))+ (sha256+ (base32+ "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"))))+ (inputs+ `(("jsoncpp" ,jsoncpp-for-tensorflow)+ ,@(alist-delete "jsoncpp" (package-inputs vtk))))))+ ;; itksnap needs an older variant of VTK. (define-public vtk-6 (package (inherit vtk)-- 2.31.0
From 199116be8ece6f2aaff2f277ece2cdbfcc487c63 Mon Sep 17 00:00:00 2001From: Ekaitz Zarraga <ekaitz@elenq.tech>Date: Wed, 14 Apr 2021 15:49:53 +0200Subject: [PATCH 2/2] gnu: freecad: Update to 0.19.1
* gnu/packages/engineering.scm (freecad): Update to 0.19.1[inputs]: Add new dependencies--- gnu/packages/engineering.scm | 217 +++++++++++++++++++---------------- 1 file changed, 117 insertions(+), 100 deletions(-)
Toggle diff (257 lines)diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scmindex b5568b8563..4274a59f5f 100644--- a/gnu/packages/engineering.scm+++ b/gnu/packages/engineering.scm@@ -17,7 +17,7 @@ ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020,2021 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>-;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>+;;; Copyright © 2020, 2021 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> ;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com>@@ -112,6 +112,8 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline)+ #:use-module (gnu packages serialization)+ #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) #:use-module (gnu packages tbb) #:use-module (gnu packages tcl)@@ -122,6 +124,7 @@ #:use-module (gnu packages web) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml)+ #:use-module (gnu packages xiph) #:use-module (gnu packages openkinect) #:use-module (gnu packages xorg)) @@ -2353,111 +2356,125 @@ full programmatic control over your models.") OpenSCAD code. It supports syntax highlighting, indenting and refilling of comments."))) + (define-public freecad- (let ((commit-ref "7616153b3c31ace006169cdc2fdafab484498858")- (revision "1"))- (package- (name "freecad")- (version (git-version "0.18.5" revision commit-ref))- (source- (origin- (method git-fetch)- (uri (git-reference- (url "https://github.com/FreeCAD/FreeCAD")- (commit commit-ref)))- (file-name (git-file-name name version))- (sha256- (base32- "16965yxnp2pq7nm8z3p0pjkzjdyq62vfrj8j3nk26bwc898czyn2"))))- (build-system qt-build-system)- (native-inputs- `(("doxygen" ,doxygen)- ("graphviz" ,graphviz)- ("qttools" ,qttools)- ("pkg-config" ,pkg-config)- ("python-pyside-2-tools" ,python-pyside-2-tools)- ("swig" ,swig)))- (inputs- `(("boost" ,boost)- ("coin3D" ,coin3D)- ("eigen" ,eigen)- ("freetype" ,freetype)- ("glew" ,glew)- ("hdf5" ,hdf5-1.10)- ("libarea" ,libarea)- ("libmedfile" ,libmedfile)- ("libspnav" ,libspnav)- ("libxi" ,libxi)- ("libxmu" ,libxmu)- ("openmpi" ,openmpi)- ("opencascade-occt" ,opencascade-occt)- ("python-matplotlib" ,python-matplotlib)- ("python-pyside-2" ,python-pyside-2)- ("python-shiboken-2" ,python-shiboken-2)- ("python-pivy" ,python-pivy)- ("python-wrapper" ,python-wrapper)- ("qtbase" ,qtbase)- ("qtsvg" ,qtsvg)- ("qtx11extras" ,qtx11extras)- ("qtxmlpatterns" ,qtxmlpatterns)- ("qtwebkit" ,qtwebkit)- ("tbb" ,tbb)- ("vtk" ,vtk)- ("xerces-c" ,xerces-c)- ("zlib" ,zlib)))- (arguments- `(#:tests? #f- #:configure-flags- (list- "-DBUILD_QT5=ON"- (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib")- (string-append "-DPYSIDE2UICBINARY="- (assoc-ref %build-inputs "python-pyside-2-tools")- "/bin/uic")- (string-append "-DPYSIDE2RCCBINARY="- (assoc-ref %build-inputs "python-pyside-2-tools")- "/bin/rcc")- "-DPYSIDE_LIBRARY=PySide2::pyside2"- (string-append- "-DPYSIDE_INCLUDE_DIR="- (assoc-ref %build-inputs "python-pyside-2") "/include;"- (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;"- (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;"- (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;"- (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;")- "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"- (string-append "-DSHIBOKEN_INCLUDE_DIR="- (assoc-ref %build-inputs "python-shiboken-2")- "/include/shiboken2"))- #:phases- (modify-phases %standard-phases- (add-before 'configure 'restore-pythonpath- (lambda _- (substitute* "src/Main/MainGui.cpp"- (("_?putenv\\(\"PYTHONPATH=\"\\);") ""))- #t))- (add-after 'install 'wrap-pythonpath- (lambda* (#:key outputs #:allow-other-keys)- (let ((out (assoc-ref outputs "out")))- (wrap-program (string-append out "/bin/FreeCAD")- (list "PYTHONPATH"- 'prefix (list (getenv "PYTHONPATH")))))- #t)))))- (home-page "https://www.freecadweb.org/")- (synopsis "Your Own 3D Parametric Modeler")- (description- "FreeCAD is a general purpose feature-based, parametric 3D modeler for+ (package+ (name "freecad")+ (version "0.19.1")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url "https://github.com/FreeCAD/FreeCAD")+ (commit version)))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "0c53q2iawy4yfp11czyc7lbr9ivp3r7v24x4c20myh11wyplffc0"))))+ (build-system qt-build-system)+ (native-inputs+ `(("doxygen" ,doxygen)+ ("graphviz" ,graphviz)+ ("qttools" ,qttools)+ ("pkg-config" ,pkg-config)+ ("python-pyside-2-tools" ,python-pyside-2-tools)+ ("swig" ,swig)))+ (inputs+ `(("boost" ,boost)+ ("coin3D" ,coin3D)+ ("double-conversion" ,double-conversion)+ ("eigen" ,eigen)+ ("freetype" ,freetype)+ ("gl2ps" ,gl2ps)+ ("glew" ,glew)+ ("hdf5" ,hdf5-1.10)+ ("jsoncpp" ,jsoncpp)+ ("libarea" ,libarea)+ ("libjpeg-turbo" ,libjpeg-turbo)+ ("libmedfile" ,libmedfile)+ ("libspnav" ,libspnav)+ ("libtheora" ,libtheora)+ ("libtiff" ,libtiff)+ ("libxi" ,libxi)+ ("libxmlplusplus" ,libxmlplusplus)+ ("libxmu" ,libxmu)+ ("lz4" ,lz4)+ ("netcdf" ,netcdf)+ ("opencascade-occt" ,opencascade-occt)+ ("openmpi" ,openmpi)+ ("proj" ,proj)+ ("python-gitpython" ,python-gitpython)+ ("python-matplotlib" ,python-matplotlib)+ ("python-pivy" ,python-pivy)+ ("python-pyside-2" ,python-pyside-2)+ ("python-pyyaml" ,python-pyyaml)+ ("python-shiboken-2" ,python-shiboken-2)+ ("python-wrapper" ,python-wrapper)+ ("qtbase" ,qtbase)+ ("qtsvg" ,qtsvg)+ ("qtwebkit" ,qtwebkit)+ ("qtx11extras" ,qtx11extras)+ ("qtxmlpatterns" ,qtxmlpatterns)+ ("sqlite" ,sqlite)+ ("tbb" ,tbb)+ ("vtk" ,vtk-8)+ ("xerces-c" ,xerces-c)+ ("zlib" ,zlib)))+ (arguments+ `(#:tests? #f+ #:configure-flags+ (list+ "-DBUILD_QT5=ON"+ "-DBUILD_FLAT_MESH:BOOL=ON"+ (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib")+ (string-append "-DPYSIDE2UICBINARY="+ (assoc-ref %build-inputs "python-pyside-2-tools")+ "/bin/uic")+ (string-append "-DPYSIDE2RCCBINARY="+ (assoc-ref %build-inputs "python-pyside-2-tools")+ "/bin/rcc")+ "-DPYSIDE_LIBRARY=PySide2::pyside2"+ (string-append+ "-DPYSIDE_INCLUDE_DIR="+ (assoc-ref %build-inputs "python-pyside-2") "/include;"+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;"+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;"+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;"+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;")+ "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"+ (string-append "-DSHIBOKEN_INCLUDE_DIR="+ (assoc-ref %build-inputs "python-shiboken-2")+ "/include/shiboken2"))+ #:phases+ (modify-phases %standard-phases+ (add-before 'configure 'restore-pythonpath+ (lambda _+ (substitute* "src/Main/MainGui.cpp"+ (("_?putenv\\(\"PYTHONPATH=\"\\);") ""))+ #t))+ (add-after 'install 'wrap-pythonpath+ (lambda* (#:key outputs #:allow-other-keys)+ (let ((out (assoc-ref outputs "out")))+ (wrap-program (string-append out "/bin/FreeCAD")+ (list "PYTHONPATH"+ 'prefix (list (getenv "PYTHONPATH")))))+ #t)))))+ (home-page "https://www.freecadweb.org/")+ (synopsis "Your Own 3D Parametric Modeler")+ (description+ "FreeCAD is a general purpose feature-based, parametric 3D modeler for CAD, MCAD, CAx, CAE and PLM, aimed directly at mechanical engineering and product design but also fits a wider range of uses in engineering, such as architecture or other engineering specialties. It is 100% Open Source (LGPL2+ license) and extremely modular, allowing for very advanced extension and customization.")- (license- (list- license:lgpl2.1+- license:lgpl2.0+- license:gpl3+- license:bsd-3)))))+ (license+ (list+ license:lgpl2.1++ license:lgpl2.0++ license:gpl3++ license:bsd-3))))+ (define-public libmedfile (package-- 2.31.0
M
M
Maxime Devos wrote on 14 Apr 23:39 +0200
4a8ff1b83b4d4580294833e421e34a52aa88a86e.camel@telenet.be
On Wed, 2021-04-14 at 15:59 +0000, Ekaitz Zarraga wrote:
Toggle quote (10 lines)> Hi,> > This set of patches update freecad from unstable to the 0.19.1 release.> > More information in this help-guix thread:> > https://lists.gnu.org/archive/html/help-guix/2021-04/msg00118.html> > Thanks!
+ `(#:tests? #fWhy's that? ‘We’ prefer to have tests enabled when possible.Please document why tests are disabled here (with a comment#:tests? #f ; no tests / tests require dependency X, which is not packaged ...).
+ (add-before 'configure 'restore-pythonpath+ (lambda _+ (substitute* "src/Main/MainGui.cpp"+ (("_?putenv\\(\"PYTHONPATH=\"\\);") ""))+ #t))
The #t can be removed. The warning that results when #t is absenthas been removed on the core-updates branch; we might as well stopintroducing these silly #t now such that we don't have to remove themlater.
Greetings,Maxme.
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYHdhAhccbWF4aW1lZGV2b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7tg/AP0Y1+O5FNY4OTxeqw65/NBxIeCTI4AEvGwSkC6MxXcvIgEA/e7gWkPocQ+j9NhiMW8BtLyJtvTMkt5MO1/qcd0q5wY==A9oO-----END PGP SIGNATURE-----

E
E
Ekaitz Zarraga wrote on 14 Apr 23:44 +0200
(name . Maxime Devos)(address . maximedevos@telenet.be)(name . 47778@debbugs.gnu.org)(address . 47778@debbugs.gnu.org)
Y6-3eSREOSuxV-uvkz1UmhQnArxXmS0aD29IH7kVgWtQZMt-50aGR-R7-QIiB49NUowBSi3VF3xt-fGGrLT_zVReOoxh_5HTtA8cpYhBlb8=@elenq.tech
Hi,
Toggle quote (7 lines)>> - `(#:tests? #f>> Why's that? ‘We’ prefer to have tests enabled when possible.> Please document why tests are disabled here (with a comment> #:tests? #f ; no tests / tests require dependency X, which is not packaged ...).
I'll try to test the package with the tests, but they weredisabled before too, so I didn't change that.
Toggle quote (25 lines)>> - (add-before 'configure 'restore-pythonpath>>> - (lambda _>>> - (substitute* "src/Main/MainGui.cpp">>> - (("_?putenv\\\\(\\"PYTHONPATH=\\"\\\\);") ""))>>> - #t))>>>> The #t can be removed. The warning that results when #t is absent> has been removed on the core-updates branch; we might as well stop> introducing these silly #t now such that we don't have to remove them> later.>> Greetings,> Maxme.
Ok, I'll remove that and update the patch.
Thanks!
E
E
Ekaitz Zarraga wrote on 15 Apr 00:58 +0200
(name . Maxime Devos)(address . maximedevos@telenet.be)(name . 47778@debbugs.gnu.org)(address . 47778@debbugs.gnu.org)
pceIjJ6DHzEsFgtRq_uUnpXNffT4E8LF7nCoBd_FV_kymAqk_ouMklhhW5e0_Qk1MkA012Isa7Jyv_NR2T7qnUkkORIX1IYFrih5gDXTJWU=@elenq.tech
Hi,
As they are not functional changes, I updated insidethe same diff.
Hope it's ok.Cheers,
Ekaitz
From 5308c3eeda66262cf5427cf040589bdaa0b85cab Mon Sep 17 00:00:00 2001From: Ekaitz Zarraga <ekaitz@elenq.tech>Date: Wed, 14 Apr 2021 15:49:53 +0200Subject: [PATCH 2/2] gnu: freecad: Update to 0.19.1
* gnu/packages/engineering.scm (freecad): Update to 0.19.1[inputs]: Add new dependencies--- gnu/packages/engineering.scm | 215 +++++++++++++++++++---------------- 1 file changed, 115 insertions(+), 100 deletions(-)
Toggle diff (255 lines)diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scmindex b5568b8563..e03cb71439 100644--- a/gnu/packages/engineering.scm+++ b/gnu/packages/engineering.scm@@ -17,7 +17,7 @@ ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020,2021 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>-;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>+;;; Copyright © 2020, 2021 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> ;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com>@@ -112,6 +112,8 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline)+ #:use-module (gnu packages serialization)+ #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) #:use-module (gnu packages tbb) #:use-module (gnu packages tcl)@@ -122,6 +124,7 @@ #:use-module (gnu packages web) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml)+ #:use-module (gnu packages xiph) #:use-module (gnu packages openkinect) #:use-module (gnu packages xorg)) @@ -2353,111 +2356,123 @@ full programmatic control over your models.") OpenSCAD code. It supports syntax highlighting, indenting and refilling of comments."))) + (define-public freecad- (let ((commit-ref "7616153b3c31ace006169cdc2fdafab484498858")- (revision "1"))- (package- (name "freecad")- (version (git-version "0.18.5" revision commit-ref))- (source- (origin- (method git-fetch)- (uri (git-reference- (url "https://github.com/FreeCAD/FreeCAD")- (commit commit-ref)))- (file-name (git-file-name name version))- (sha256- (base32- "16965yxnp2pq7nm8z3p0pjkzjdyq62vfrj8j3nk26bwc898czyn2"))))- (build-system qt-build-system)- (native-inputs- `(("doxygen" ,doxygen)- ("graphviz" ,graphviz)- ("qttools" ,qttools)- ("pkg-config" ,pkg-config)- ("python-pyside-2-tools" ,python-pyside-2-tools)- ("swig" ,swig)))- (inputs- `(("boost" ,boost)- ("coin3D" ,coin3D)- ("eigen" ,eigen)- ("freetype" ,freetype)- ("glew" ,glew)- ("hdf5" ,hdf5-1.10)- ("libarea" ,libarea)- ("libmedfile" ,libmedfile)- ("libspnav" ,libspnav)- ("libxi" ,libxi)- ("libxmu" ,libxmu)- ("openmpi" ,openmpi)- ("opencascade-occt" ,opencascade-occt)- ("python-matplotlib" ,python-matplotlib)- ("python-pyside-2" ,python-pyside-2)- ("python-shiboken-2" ,python-shiboken-2)- ("python-pivy" ,python-pivy)- ("python-wrapper" ,python-wrapper)- ("qtbase" ,qtbase)- ("qtsvg" ,qtsvg)- ("qtx11extras" ,qtx11extras)- ("qtxmlpatterns" ,qtxmlpatterns)- ("qtwebkit" ,qtwebkit)- ("tbb" ,tbb)- ("vtk" ,vtk)- ("xerces-c" ,xerces-c)- ("zlib" ,zlib)))- (arguments- `(#:tests? #f- #:configure-flags- (list- "-DBUILD_QT5=ON"- (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib")- (string-append "-DPYSIDE2UICBINARY="- (assoc-ref %build-inputs "python-pyside-2-tools")- "/bin/uic")- (string-append "-DPYSIDE2RCCBINARY="- (assoc-ref %build-inputs "python-pyside-2-tools")- "/bin/rcc")- "-DPYSIDE_LIBRARY=PySide2::pyside2"- (string-append- "-DPYSIDE_INCLUDE_DIR="- (assoc-ref %build-inputs "python-pyside-2") "/include;"- (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;"- (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;"- (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;"- (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;")- "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"- (string-append "-DSHIBOKEN_INCLUDE_DIR="- (assoc-ref %build-inputs "python-shiboken-2")- "/include/shiboken2"))- #:phases- (modify-phases %standard-phases- (add-before 'configure 'restore-pythonpath- (lambda _- (substitute* "src/Main/MainGui.cpp"- (("_?putenv\\(\"PYTHONPATH=\"\\);") ""))- #t))- (add-after 'install 'wrap-pythonpath- (lambda* (#:key outputs #:allow-other-keys)- (let ((out (assoc-ref outputs "out")))- (wrap-program (string-append out "/bin/FreeCAD")- (list "PYTHONPATH"- 'prefix (list (getenv "PYTHONPATH")))))- #t)))))- (home-page "https://www.freecadweb.org/")- (synopsis "Your Own 3D Parametric Modeler")- (description- "FreeCAD is a general purpose feature-based, parametric 3D modeler for+ (package+ (name "freecad")+ (version "0.19.1")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url "https://github.com/FreeCAD/FreeCAD")+ (commit version)))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "0c53q2iawy4yfp11czyc7lbr9ivp3r7v24x4c20myh11wyplffc0"))))+ (build-system qt-build-system)+ (native-inputs+ `(("doxygen" ,doxygen)+ ("graphviz" ,graphviz)+ ("qttools" ,qttools)+ ("pkg-config" ,pkg-config)+ ("python-pyside-2-tools" ,python-pyside-2-tools)+ ("swig" ,swig)))+ (inputs+ `(("boost" ,boost)+ ("coin3D" ,coin3D)+ ("double-conversion" ,double-conversion)+ ("eigen" ,eigen)+ ("freetype" ,freetype)+ ("gl2ps" ,gl2ps)+ ("glew" ,glew)+ ("hdf5" ,hdf5-1.10)+ ("jsoncpp" ,jsoncpp)+ ("libarea" ,libarea)+ ("libjpeg-turbo" ,libjpeg-turbo)+ ("libmedfile" ,libmedfile)+ ("libspnav" ,libspnav)+ ("libtheora" ,libtheora)+ ("libtiff" ,libtiff)+ ("libxi" ,libxi)+ ("libxmlplusplus" ,libxmlplusplus)+ ("libxmu" ,libxmu)+ ("lz4" ,lz4)+ ("netcdf" ,netcdf)+ ("opencascade-occt" ,opencascade-occt)+ ("openmpi" ,openmpi)+ ("proj" ,proj)+ ("python-gitpython" ,python-gitpython)+ ("python-matplotlib" ,python-matplotlib)+ ("python-pivy" ,python-pivy)+ ("python-pyside-2" ,python-pyside-2)+ ("python-pyyaml" ,python-pyyaml)+ ("python-shiboken-2" ,python-shiboken-2)+ ("python-wrapper" ,python-wrapper)+ ("qtbase" ,qtbase)+ ("qtsvg" ,qtsvg)+ ("qtwebkit" ,qtwebkit)+ ("qtx11extras" ,qtx11extras)+ ("qtxmlpatterns" ,qtxmlpatterns)+ ("sqlite" ,sqlite)+ ("tbb" ,tbb)+ ("vtk" ,vtk-8)+ ("xerces-c" ,xerces-c)+ ("zlib" ,zlib)))+ (arguments+ `(#:tests? #f ; Project has no tests+ #:configure-flags+ (list+ "-DBUILD_QT5=ON"+ "-DBUILD_FLAT_MESH:BOOL=ON"+ (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib")+ (string-append "-DPYSIDE2UICBINARY="+ (assoc-ref %build-inputs "python-pyside-2-tools")+ "/bin/uic")+ (string-append "-DPYSIDE2RCCBINARY="+ (assoc-ref %build-inputs "python-pyside-2-tools")+ "/bin/rcc")+ "-DPYSIDE_LIBRARY=PySide2::pyside2"+ (string-append+ "-DPYSIDE_INCLUDE_DIR="+ (assoc-ref %build-inputs "python-pyside-2") "/include;"+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;"+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;"+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;"+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;")+ "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"+ (string-append "-DSHIBOKEN_INCLUDE_DIR="+ (assoc-ref %build-inputs "python-shiboken-2")+ "/include/shiboken2"))+ #:phases+ (modify-phases %standard-phases+ (add-before 'configure 'restore-pythonpath+ (lambda _+ (substitute* "src/Main/MainGui.cpp"+ (("_?putenv\\(\"PYTHONPATH=\"\\);") ""))))+ (add-after 'install 'wrap-pythonpath+ (lambda* (#:key outputs #:allow-other-keys)+ (let ((out (assoc-ref outputs "out")))+ (wrap-program (string-append out "/bin/FreeCAD")+ (list "PYTHONPATH"+ 'prefix (list (getenv "PYTHONPATH"))))))))))+ (home-page "https://www.freecadweb.org/")+ (synopsis "Your Own 3D Parametric Modeler")+ (description+ "FreeCAD is a general purpose feature-based, parametric 3D modeler for CAD, MCAD, CAx, CAE and PLM, aimed directly at mechanical engineering and product design but also fits a wider range of uses in engineering, such as architecture or other engineering specialties. It is 100% Open Source (LGPL2+ license) and extremely modular, allowing for very advanced extension and customization.")- (license- (list- license:lgpl2.1+- license:lgpl2.0+- license:gpl3+- license:bsd-3)))))+ (license+ (list+ license:lgpl2.1++ license:lgpl2.0++ license:gpl3++ license:bsd-3))))+ (define-public libmedfile (package-- 2.31.0
L
L
Leo Famulari wrote on 16 Apr 04:26 +0200
(name . Ekaitz Zarraga)(address . ekaitz@elenq.tech)
YHj1u3t/Nn0JrpJx@jasmine.lan
On Wed, Apr 14, 2021 at 10:58:57PM +0000, Ekaitz Zarraga wrote:
Toggle quote (18 lines)> Hi,> > As they are not functional changes, I updated inside> the same diff.> > Hope it's ok.> Cheers,> > Ekaitz
> From 5308c3eeda66262cf5427cf040589bdaa0b85cab Mon Sep 17 00:00:00 2001> From: Ekaitz Zarraga <ekaitz@elenq.tech>> Date: Wed, 14 Apr 2021 15:49:53 +0200> Subject: [PATCH 2/2] gnu: freecad: Update to 0.19.1> > * gnu/packages/engineering.scm (freecad): Update to 0.19.1> [inputs]: Add new dependencies
Thanks! I filled out the commit message and pushed the patches asce2fe8bf34199e2b9788a7f77c0ad0bbdfa713bd.
Thanks for reviewing Maxime! I wanted to make sure this made it into theupcoming release :)
Closed
?