gnu: freecad: Update to 0.19.1.

* gnu/packages/engineering.scm (freecad): Update to 0.19.1
[inputs]: Add double-conversion, gl2ps, jsoncpp, libjpeg-turbo, libtheora,
libtiff, libxmlplusplus, lz4, netcdf, proj, python-gitpython, python-pyyaml,
sqlite, and vtk-8. Remove vtk.
[arguments]: Add "-DBUILD_FLAT_MESH:BOOL=ON" to #:configure-flags.
This commit is contained in:
Ekaitz Zarraga 2021-04-14 15:49:53 +02:00 committed by Leo Famulari
parent 950475bb96
commit ce2fe8bf34
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08

View file

@ -17,7 +17,7 @@
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020,2021 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020,2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.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 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
@ -112,6 +112,8 @@
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages serialization)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
#:use-module (gnu packages tbb) #:use-module (gnu packages tbb)
#:use-module (gnu packages tcl) #:use-module (gnu packages tcl)
@ -122,6 +124,7 @@
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages wxwidgets) #:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xiph)
#:use-module (gnu packages openkinect) #:use-module (gnu packages openkinect)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg))
@ -2354,110 +2357,120 @@ OpenSCAD code. It supports syntax highlighting, indenting and refilling of
comments."))) comments.")))
(define-public freecad (define-public freecad
(let ((commit-ref "7616153b3c31ace006169cdc2fdafab484498858") (package
(revision "1")) (name "freecad")
(package (version "0.19.1")
(name "freecad") (source
(version (git-version "0.18.5" revision commit-ref)) (origin
(source (method git-fetch)
(origin (uri (git-reference
(method git-fetch) (url "https://github.com/FreeCAD/FreeCAD")
(uri (git-reference (commit version)))
(url "https://github.com/FreeCAD/FreeCAD") (file-name (git-file-name name version))
(commit commit-ref))) (sha256
(file-name (git-file-name name version)) (base32
(sha256 "0c53q2iawy4yfp11czyc7lbr9ivp3r7v24x4c20myh11wyplffc0"))))
(base32 (build-system qt-build-system)
"16965yxnp2pq7nm8z3p0pjkzjdyq62vfrj8j3nk26bwc898czyn2")))) (native-inputs
(build-system qt-build-system) `(("doxygen" ,doxygen)
(native-inputs ("graphviz" ,graphviz)
`(("doxygen" ,doxygen) ("qttools" ,qttools)
("graphviz" ,graphviz) ("pkg-config" ,pkg-config)
("qttools" ,qttools) ("python-pyside-2-tools" ,python-pyside-2-tools)
("pkg-config" ,pkg-config) ("swig" ,swig)))
("python-pyside-2-tools" ,python-pyside-2-tools) (inputs
("swig" ,swig))) `(("boost" ,boost)
(inputs ("coin3D" ,coin3D)
`(("boost" ,boost) ("double-conversion" ,double-conversion)
("coin3D" ,coin3D) ("eigen" ,eigen)
("eigen" ,eigen) ("freetype" ,freetype)
("freetype" ,freetype) ("gl2ps" ,gl2ps)
("glew" ,glew) ("glew" ,glew)
("hdf5" ,hdf5-1.10) ("hdf5" ,hdf5-1.10)
("libarea" ,libarea) ("jsoncpp" ,jsoncpp)
("libmedfile" ,libmedfile) ("libarea" ,libarea)
("libspnav" ,libspnav) ("libjpeg-turbo" ,libjpeg-turbo)
("libxi" ,libxi) ("libmedfile" ,libmedfile)
("libxmu" ,libxmu) ("libspnav" ,libspnav)
("openmpi" ,openmpi) ("libtheora" ,libtheora)
("opencascade-occt" ,opencascade-occt) ("libtiff" ,libtiff)
("python-matplotlib" ,python-matplotlib) ("libxi" ,libxi)
("python-pyside-2" ,python-pyside-2) ("libxmlplusplus" ,libxmlplusplus)
("python-shiboken-2" ,python-shiboken-2) ("libxmu" ,libxmu)
("python-pivy" ,python-pivy) ("lz4" ,lz4)
("python-wrapper" ,python-wrapper) ("netcdf" ,netcdf)
("qtbase" ,qtbase) ("opencascade-occt" ,opencascade-occt)
("qtsvg" ,qtsvg) ("openmpi" ,openmpi)
("qtx11extras" ,qtx11extras) ("proj" ,proj)
("qtxmlpatterns" ,qtxmlpatterns) ("python-gitpython" ,python-gitpython)
("qtwebkit" ,qtwebkit) ("python-matplotlib" ,python-matplotlib)
("tbb" ,tbb) ("python-pivy" ,python-pivy)
("vtk" ,vtk) ("python-pyside-2" ,python-pyside-2)
("xerces-c" ,xerces-c) ("python-pyyaml" ,python-pyyaml)
("zlib" ,zlib))) ("python-shiboken-2" ,python-shiboken-2)
(arguments ("python-wrapper" ,python-wrapper)
`(#:tests? #f ("qtbase" ,qtbase)
#:configure-flags ("qtsvg" ,qtsvg)
(list ("qtwebkit" ,qtwebkit)
"-DBUILD_QT5=ON" ("qtx11extras" ,qtx11extras)
(string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib") ("qtxmlpatterns" ,qtxmlpatterns)
(string-append "-DPYSIDE2UICBINARY=" ("sqlite" ,sqlite)
(assoc-ref %build-inputs "python-pyside-2-tools") ("tbb" ,tbb)
"/bin/uic") ("vtk" ,vtk-8)
(string-append "-DPYSIDE2RCCBINARY=" ("xerces-c" ,xerces-c)
(assoc-ref %build-inputs "python-pyside-2-tools") ("zlib" ,zlib)))
"/bin/rcc") (arguments
"-DPYSIDE_LIBRARY=PySide2::pyside2" `(#:tests? #f ; Project has no tests
(string-append #:configure-flags
"-DPYSIDE_INCLUDE_DIR=" (list
(assoc-ref %build-inputs "python-pyside-2") "/include;" "-DBUILD_QT5=ON"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;" "-DBUILD_FLAT_MESH:BOOL=ON"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;" (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib")
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;" (string-append "-DPYSIDE2UICBINARY="
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;") (assoc-ref %build-inputs "python-pyside-2-tools")
"-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" "/bin/uic")
(string-append "-DSHIBOKEN_INCLUDE_DIR=" (string-append "-DPYSIDE2RCCBINARY="
(assoc-ref %build-inputs "python-shiboken-2") (assoc-ref %build-inputs "python-pyside-2-tools")
"/include/shiboken2")) "/bin/rcc")
#:phases "-DPYSIDE_LIBRARY=PySide2::pyside2"
(modify-phases %standard-phases (string-append
(add-before 'configure 'restore-pythonpath "-DPYSIDE_INCLUDE_DIR="
(lambda _ (assoc-ref %build-inputs "python-pyside-2") "/include;"
(substitute* "src/Main/MainGui.cpp" (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;"
(("_?putenv\\(\"PYTHONPATH=\"\\);") "")) (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;"
#t)) (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;"
(add-after 'install 'wrap-pythonpath (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;")
(lambda* (#:key outputs #:allow-other-keys) "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
(let ((out (assoc-ref outputs "out"))) (string-append "-DSHIBOKEN_INCLUDE_DIR="
(wrap-program (string-append out "/bin/FreeCAD") (assoc-ref %build-inputs "python-shiboken-2")
(list "PYTHONPATH" "/include/shiboken2"))
'prefix (list (getenv "PYTHONPATH"))))) #:phases
#t))))) (modify-phases %standard-phases
(home-page "https://www.freecadweb.org/") (add-before 'configure 'restore-pythonpath
(synopsis "Your Own 3D Parametric Modeler") (lambda _
(description (substitute* "src/Main/MainGui.cpp"
"FreeCAD is a general purpose feature-based, parametric 3D modeler for (("_?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 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 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+ architecture or other engineering specialties. It is 100% Open Source (LGPL2+
license) and extremely modular, allowing for very advanced extension and license) and extremely modular, allowing for very advanced extension and
customization.") customization.")
(license (license
(list (list
license:lgpl2.1+ license:lgpl2.1+
license:lgpl2.0+ license:lgpl2.0+
license:gpl3+ license:gpl3+
license:bsd-3))))) license:bsd-3))))
(define-public libmedfile (define-public libmedfile
(package (package