bug#41170: closed ([PATCH] gnu: freecad: Fix build with python-3.8)

[GNU bug Tracking System]

Your message dated Sun, 10 May 2020 23:07:35 +0200
with message-id <address@hidden>
and subject line Re: [bug#41170] [PATCH] gnu: freecad: Fix build with python-3.8
has caused the debbugs.gnu.org bug report #41170,
regarding [PATCH] gnu: freecad: Fix build with python-3.8
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden.)


-- 
41170: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=41170
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: freecad: Fix build with python-3.8
>
>
>
>
> Date: 
>
> Sun, 10 May 2020 22:23:18 +1200
>
>
>
>
> * gnu/packages/engineering.scm (freecad): Fix build with python-3.8
> ---
>  gnu/packages/engineering.scm | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
> index 15101e3aee..5e204201bd 100644
> --- a/gnu/packages/engineering.scm
> +++ b/gnu/packages/engineering.scm
> @@ -2312,6 +2312,13 @@ full programmatic control over your models.")
>         (uri (git-reference
>               (url "https://github.com/FreeCAD/FreeCAD.git";)
>               (commit version)))
> +       (modules '((guix build utils)))
> +       (snippet
> +        '(begin
> +           ;; https://tracker.freecadweb.org/view.php?id=4143
> +           (substitute* "src/Base/swigpyrun.inl"
> +             (("PyObject \\*modules = interp->modules;")
> +               "PyObject *modules = PyEval_GetBuiltins();")) #t))
>         (file-name (git-file-name name version))
>         (sha256
>          (base32
> -- 
> 2.26.2
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#41170] [PATCH] gnu: freecad: Fix build with python-3.8 Date: Sun, 10 May 2020 23:07:35 +0200 User-agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu)

"Boris A. Dekshteyn" <address@hidden> writes:

> * gnu/packages/engineering.scm (freecad): Fix build with python-3.8

Thank you!

[...]

> +       (modules '((guix build utils)))
> +       (snippet
> +        '(begin
> +           ;; https://tracker.freecadweb.org/view.php?id=4143
> +           (substitute* "src/Base/swigpyrun.inl"
> +             (("PyObject \\*modules = interp->modules;")
> +               "PyObject *modules = PyEval_GetBuiltins();")) #t))

I gave a little more context in the comment, moved the #t on a line of
its own, and fixed the indentation.  I also edited the commit message
slightly.

Pushed as 72099cb0f20e87807f29b5a11a584ab7c66297ef.

signature.asc
Description: PGP signature

--- End Message ---