unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#41170] [PATCH] gnu: freecad: Fix build with python-3.8
@ 2020-05-10 10:23 Boris A. Dekshteyn
  2020-05-10 21:07 ` bug#41170: " Marius Bakke
  0 siblings, 1 reply; 2+ messages in thread
From: Boris A. Dekshteyn @ 2020-05-10 10:23 UTC (permalink / raw)
  To: 41170; +Cc: Boris A. Dekshteyn

* 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





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#41170: [PATCH] gnu: freecad: Fix build with python-3.8
  2020-05-10 10:23 [bug#41170] [PATCH] gnu: freecad: Fix build with python-3.8 Boris A. Dekshteyn
@ 2020-05-10 21:07 ` Marius Bakke
  0 siblings, 0 replies; 2+ messages in thread
From: Marius Bakke @ 2020-05-10 21:07 UTC (permalink / raw)
  To: Boris A. Dekshteyn, 41170-done; +Cc: Boris A. Dekshteyn

[-- Attachment #1: Type: text/plain, Size: 679 bytes --]

"Boris A. Dekshteyn" <boris.dekshteyn@gmail.com> 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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-05-10 21:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-10 10:23 [bug#41170] [PATCH] gnu: freecad: Fix build with python-3.8 Boris A. Dekshteyn
2020-05-10 21:07 ` bug#41170: " Marius Bakke

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).