Subject: [bug#45573] [PATCH] Correct freecad runtime errors

From: Leo Famulari <[email-masked]>
Date: Sun, 3 Jan 2021 19:18:49 -0500

On Fri, Jan 01, 2021 at 02:37:39PM +0000, Ekaitz Zarraga wrote:
> Subject: [PATCH 3/6] gnu: Add python-pivy.
> 
>     * gnu/packages/python-xyz.scm (python-pivy): New variable.

> +      `(#:tests? #f ; Tests are broken

Can you clarify what you mean, and the overall situation with the tests?
Are they actually used upstream?

> +        #:phases
> +        (modify-phases %standard-phases
> +          (add-after 'unpack 'patch-cmake-include-dirs
> +           (lambda _
> +             ;; Patch buildsystem to respect Coin3D include directory
> +             (substitute* "CMakeLists.txt"
> +                          (("\\$\\{SoQt_INCLUDE_DIRS}")
> +                           "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}"))

This can probably be fixed with #:configure-flags. I can look into this
before pushing.

> Subject: [PATCH 4/6] gnu: FreeCad: Update to 0.18.5-1.7616153.
> 
> Fixes Draft module import errors
> 
>     * gnu/packages/engineering.scm (freecad): Update to 0.18.5-1.7616153.
>     [inputs]: Add python-pivy.

> Subject: [PATCH 5/6] gnu: freecad: move python-pyside-2-tools to native-inputs
> 
>     * gnu/packages/engineering.scm (freecad):
>     [inputs]: Remove python-pyside-2-tools.
>     [native-inputs]: Add python-pyside-2-tools.

The re-indentation of the package in patch 4/6 is not complete, and I
will squash these two patches before pushing. I have this "ready to go"
in my Git tree.

> Subject: [PATCH 6/6] gnu: freecad: Add qtwebkit input.
> 
>     * gnu/packages/engineering.scm (freecad):
>     [inputs]: Add qtwebkit.

> -       ;; qtwebkit is optional. We remove it currently, because it takes
> -       ;; much time to compile and substitutes are often unavailable
> -       ;;("qtwebkit" ,qtwebkit)
> +       ("qtwebkit" ,qtwebkit)

The comment is still true... I recommend adding a note in the commit
message saying what the new dependency enables.