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.

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 @@ (define-module (gnu packages engineering)
   #: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 @@ (define-module (gnu packages engineering)
   #: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))
 
@@ -2354,21 +2357,19 @@ (define-public emacs-scad-mode
 comments.")))
 
 (define-public freecad
-  (let ((commit-ref "7616153b3c31ace006169cdc2fdafab484498858")
-        (revision "1"))
   (package
     (name "freecad")
-      (version (git-version "0.18.5" revision commit-ref))
+    (version "0.19.1")
     (source
       (origin
         (method git-fetch)
         (uri (git-reference
                (url "https://github.com/FreeCAD/FreeCAD")
-                 (commit commit-ref)))
+               (commit version)))
         (file-name (git-file-name name version))
         (sha256
           (base32
-              "16965yxnp2pq7nm8z3p0pjkzjdyq62vfrj8j3nk26bwc898czyn2"))))
+            "0c53q2iawy4yfp11czyc7lbr9ivp3r7v24x4c20myh11wyplffc0"))))
     (build-system qt-build-system)
     (native-inputs
      `(("doxygen" ,doxygen)
@@ -2380,36 +2381,50 @@ (define-public freecad
     (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)
-         ("openmpi" ,openmpi)
+       ("lz4" ,lz4)
+       ("netcdf" ,netcdf)
        ("opencascade-occt" ,opencascade-occt)
+       ("openmpi" ,openmpi)
+       ("proj" ,proj)
+       ("python-gitpython" ,python-gitpython)
        ("python-matplotlib" ,python-matplotlib)
-         ("python-pyside-2" ,python-pyside-2)
-         ("python-shiboken-2" ,python-shiboken-2)
        ("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)
-         ("qtwebkit" ,qtwebkit)
+       ("sqlite" ,sqlite)
        ("tbb" ,tbb)
-         ("vtk" ,vtk)
+       ("vtk" ,vtk-8)
        ("xerces-c" ,xerces-c)
        ("zlib" ,zlib)))
     (arguments
-       `(#:tests? #f
+     `(#: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")
@@ -2434,15 +2449,13 @@ (define-public freecad
          (add-before 'configure 'restore-pythonpath
            (lambda _
              (substitute* "src/Main/MainGui.cpp"
-                 (("_?putenv\\(\"PYTHONPATH=\"\\);") ""))
+               (("_?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")))))
+                       'prefix (list (getenv "PYTHONPATH"))))))))))
-               #t)))))
     (home-page "https://www.freecadweb.org/")
     (synopsis "Your Own 3D Parametric Modeler")
     (description
@@ -2457,7 +2470,7 @@ (define-public freecad
       license:lgpl2.1+
       license:lgpl2.0+
       license:gpl3+
-        license:bsd-3)))))
+      license:bsd-3))))
 
 (define-public libmedfile
   (package